X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=8235d9b9a51b57558185185a7a61e7f1de1e3c99;hb=de5b08fb;hp=95b94c3c09cb3dc8a3463f854773c747f266286c;hpb=a98346f664aae148d26a8e158008b773d73db96f;p=vpp.git

diff --git a/src/vnet.am b/src/vnet.am
index 95b94c3c09c..8235d9b9a51 100644
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -117,10 +117,10 @@ API_FILES += vnet/cop/cop.api
 # 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/mac_address.c			\
  vnet/ethernet/node.c				\
  vnet/ethernet/pg.c				\
  vnet/ethernet/sfp.c				\
@@ -132,7 +132,6 @@ libvnet_multiversioning_sources +=		\
  vnet/l2/l2_output.c
 
 nobase_include_HEADERS +=			\
- vnet/ethernet/arp_packet.h			\
  vnet/ethernet/error.def			\
  vnet/ethernet/ethernet.h			\
  vnet/ethernet/packet.h				\
@@ -141,7 +140,9 @@ nobase_include_HEADERS +=			\
  vnet/ethernet/p2p_ethernet.api.h		\
  vnet/ethernet/p2p_ethernet.h
 
-API_FILES += vnet/ethernet/p2p_ethernet.api
+API_FILES += \
+ vnet/ethernet/p2p_ethernet.api			\
+ vnet/ethernet/ethernet_types.api
 
 ########################################
 # Layer 2 protocol: Ethernet bridging
@@ -262,6 +263,9 @@ nobase_include_HEADERS +=			\
   vnet/vxlan/vxlan_error.def			\
   vnet/vxlan/vxlan.api.h
 
+libvnet_multiversioning_sources +=		\
+  vnet/vxlan/decap.c
+
 API_FILES += vnet/vxlan/vxlan.api
 
 ########################################
@@ -350,10 +354,12 @@ libvnet_la_SOURCES +=				\
  vnet/ip/icmp4.c				\
  vnet/ip/icmp6.c				\
  vnet/ip/ip46_cli.c				\
+ vnet/ip/ip_types_api.c				\
  vnet/ip/ip4_format.c				\
  vnet/ip/ip4_forward.c				\
  vnet/ip/ip4_punt_drop.c			\
  vnet/ip/ip4_input.c				\
+ vnet/ip/ip4_options.c				\
  vnet/ip/ip4_mtrie.c				\
  vnet/ip/ip4_pg.c				\
  vnet/ip/ip4_source_and_port_range_check.c	\
@@ -417,8 +423,19 @@ API_FILES += 					\
  vnet/ip/punt.api
 
 libvnet_multiversioning_sources +=		\
+ vnet/ip/ip4_forward.c				\
  vnet/ip/ip4_input.c
 
+########################################
+# Layer 2/3 ARP
+########################################
+libvnet_la_SOURCES +=               \
+ vnet/ethernet/arp.c
+
+nobase_include_HEADERS +=           \
+ vnet/ethernet/arp_packet.h         \
+ vnet/ethernet/arp.h
+
 ########################################
 # Bidirectional Forwarding Detection
 ########################################
@@ -488,37 +505,6 @@ libvnet_la_SOURCES +=				\
 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 -ldl -lsvm -lrt
-
-test_map_LDFLAGS = -static
-endif
-
 ########################################
 # Layer 4 protocol: tcp
 ########################################
@@ -530,7 +516,6 @@ libvnet_la_SOURCES +=				\
  vnet/tcp/tcp_output.c				\
  vnet/tcp/tcp_input.c				\
  vnet/tcp/tcp_newreno.c				\
- vnet/tcp/tcp_test.c				\
  vnet/tcp/tcp.c
 
 nobase_include_HEADERS +=			\
@@ -538,6 +523,7 @@ nobase_include_HEADERS +=			\
  vnet/tcp/tcp_timer.h				\
  vnet/tcp/tcp_debug.h				\
  vnet/tcp/tcp.h					\
+ vnet/tcp/tcp_error.def				\
  vnet/tcp/tcp.api.h
 
 API_FILES += vnet/tcp/tcp.api
@@ -947,16 +933,22 @@ API_FILES += vnet/pg/pg.api
 libvnet_la_SOURCES +=				\
   vnet/devices/virtio/device.c			\
   vnet/devices/virtio/node.c			\
-  vnet/devices/virtio/vhost-user.c		\
+  vnet/devices/virtio/vhost_user.c		\
+  vnet/devices/virtio/vhost_user_input.c	\
+  vnet/devices/virtio/vhost_user_output.c	\
   vnet/devices/virtio/vhost_user_api.c		\
   vnet/devices/virtio/virtio.c
 
 
 nobase_include_HEADERS +=			\
   vnet/devices/virtio/virtio.h			\
-  vnet/devices/virtio/vhost-user.h		\
+  vnet/devices/virtio/vhost_user.h		\
   vnet/devices/virtio/vhost_user.api.h
 
+libvnet_multiversioning_sources +=		\
+  vnet/devices/virtio/vhost_user_input.c	\
+  vnet/devices/virtio/vhost_user_output.c
+
 API_FILES += vnet/devices/virtio/vhost_user.api
 
 ########################################
@@ -974,6 +966,20 @@ nobase_include_HEADERS += 			\
 
 API_FILES += vnet/devices/tap/tapv2.api
 
+########################################
+# tap interface (with virtio backend)
+########################################
+
+libvnet_la_SOURCES += 				\
+  vnet/devices/pipe/pipe_api.c			\
+  vnet/devices/pipe/pipe.c
+
+nobase_include_HEADERS += 			\
+  vnet/devices/pipe/pipe.h			\
+  vnet/devices/pipe/pipe.api.h
+
+API_FILES += vnet/devices/pipe/pipe.api
+
 ########################################
 # session managmeent
 ########################################
@@ -1240,8 +1246,12 @@ nobase_include_HEADERS +=			\
 libvnet_la_SOURCES +=                    \
   vnet/util/radix.c			     \
   vnet/util/refcount.c			 \
+  vnet/util/throttle.c			 \
   vnet/util/trajectory.c
 
+nobase_include_HEADERS +=                       \
+  vnet/util/throttle.h
+
 ########################################
 # QoS
 ########################################