X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=2bae8678c4b5fd7eb66436bb26ca9cfe3da694e2;hb=f068c3e;hp=72e67dcb298695e944727e43ddab77336d85f4cd;hpb=430ac939d115b59e3f7f704645c6f88878223e1b;p=vpp.git

diff --git a/src/vnet.am b/src/vnet.am
index 72e67dcb298..2bae8678c4b 100644
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -34,6 +34,7 @@ libvnet_la_SOURCES +=				\
   vnet/buffer.c					\
   vnet/config.c					\
   vnet/devices/devices.c			\
+  vnet/devices/netlink.c			\
   vnet/handoff.c				\
   vnet/interface.c				\
   vnet/interface_api.c				\
@@ -48,6 +49,7 @@ nobase_include_HEADERS +=			\
   vnet/buffer.h					\
   vnet/config.h					\
   vnet/devices/devices.h			\
+  vnet/devices/netlink.h			\
   vnet/global_funcs.h				\
   vnet/handoff.h				\
   vnet/interface.h				\
@@ -61,7 +63,8 @@ nobase_include_HEADERS +=			\
   vnet/vnet.h					\
   vnet/vnet_all_api_h.h				\
   vnet/vnet_msg_enum.h				\
-  vnet/util/radix.h
+  vnet/util/radix.h                 \
+  vnet/util/refcount.h
 
 API_FILES += vnet/interface.api
 
@@ -769,11 +772,15 @@ API_FILES += vnet/srv6/sr.api
 
 libvnet_la_SOURCES +=				\
  vnet/srmpls/sr_mpls_policy.c		\
- vnet/srmpls/sr_mpls_steering.c
+ vnet/srmpls/sr_mpls_steering.c   \
+ vnet/srmpls/sr_mpls_api.c
 
 
 nobase_include_HEADERS +=			\
- vnet/srmpls/sr.h
+ vnet/srmpls/sr_mpls.h      \
+ vnet/srmpls/sr_mpls.api.h
+
+API_FILES += vnet/srmpls/sr_mpls.api
 
 ########################################
 # IPFIX / netflow v10
@@ -867,16 +874,36 @@ API_FILES += vnet/pg/pg.api
 # virtio
 ########################################
 
-libvnet_la_SOURCES +=       \
-  vnet/devices/virtio/vhost-user.c	\
-  vnet/devices/virtio/vhost_user_api.c
+libvnet_la_SOURCES +=				\
+  vnet/devices/virtio/device.c			\
+  vnet/devices/virtio/node.c			\
+  vnet/devices/virtio/vhost-user.c		\
+  vnet/devices/virtio/vhost_user_api.c		\
+  vnet/devices/virtio/virtio.c
+
 
-nobase_include_HEADERS +=     \
-  vnet/devices/virtio/vhost-user.h	\
+nobase_include_HEADERS +=			\
+  vnet/devices/virtio/virtio.h			\
+  vnet/devices/virtio/vhost-user.h		\
   vnet/devices/virtio/vhost_user.api.h
 
 API_FILES += vnet/devices/virtio/vhost_user.api
 
+########################################
+# tap interface (with virtio backend)
+########################################
+
+libvnet_la_SOURCES += 				\
+  vnet/devices/tap/cli.c			\
+  vnet/devices/tap/tap.c			\
+  vnet/devices/tap/tapv2_api.c
+
+nobase_include_HEADERS += 			\
+  vnet/devices/tap/tap.h			\
+  vnet/devices/tap/tapv2.api.h
+
+API_FILES += vnet/devices/tap/tapv2.api
+
 ########################################
 # ssvm ethernet
 ########################################
@@ -1087,7 +1114,7 @@ libvnet_la_SOURCES +=				\
   vnet/dpo/mpls_disposition.c   		\
   vnet/dpo/mpls_label_dpo.c			\
   vnet/dpo/l3_proxy_dpo.c			\
-  vnet/dpo/l2_bridge_dpo.c
+  vnet/dpo/dvr_dpo.c
 
 nobase_include_HEADERS +=			\
   vnet/dpo/load_balance.h			\
@@ -1125,7 +1152,8 @@ nobase_include_HEADERS +=			\
 ########################################
 
 libvnet_la_SOURCES +=                    \
-  vnet/util/radix.c			 \
+  vnet/util/radix.c			     \
+  vnet/util/refcount.c			 \
   vnet/util/trajectory.c
 
 ########################################
@@ -1151,7 +1179,8 @@ libvnet_la_SOURCES +=                           \
   vnet/bier/bier_disp_entry.c			\
   vnet/bier/bier_disp_lookup_node.c		\
   vnet/bier/bier_disp_dispatch_node.c		\
-  vnet/bier/bier_disp_table.c
+  vnet/bier/bier_disp_table.c			\
+  vnet/bier/bier_bift_table.c
 
 nobase_include_HEADERS +=			\
   vnet/bier/bier_types.h                        \
@@ -1162,6 +1191,21 @@ nobase_include_HEADERS +=			\
 
 API_FILES += vnet/bier/bier.api
 
+########################################
+# Test apps
+########################################
+
+noinst_PROGRAMS += tcp_echo udp_echo
+
+TEST_APPS_LDADD = libvlibmemoryclient.la libsvm.la libvppinfra.la
+TEST_APPS_LDADD += -lpthread -lm -lrt
+
+tcp_echo_SOURCES = tests/vnet/session/tcp_echo.c
+tcp_echo_LDADD = $(TEST_APPS_LDADD)
+
+udp_echo_SOURCES = tests/vnet/session/udp_echo.c
+udp_echo_LDADD = $(TEST_APPS_LDADD)
+
 ########################################
 # Plugin client library
 ########################################