Code Review / vpp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Refactor the ARP throttle into a common type so it can be reused
[vpp.git] / src / vnet.am
diff --git a/src/vnet.am b/src/vnet.am
index 3450b10..b9402b1 100644 (file)
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -21,7 +21,7 @@ libvnet_la_DEPENDENCIES = \
        libsvmdb.la             \
        libsvm.la               \
        libvlibmemory.la
-libvnet_multiversioning_files =
+libvnet_multiversioning_sources =
 
 libvnet_la_LIBADD = $(libvnet_la_DEPENDENCIES) -lm -lpthread -ldl -lrt
 
@@ -117,7 +117,6 @@ 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                     \
@@ -128,11 +127,10 @@ libvnet_la_SOURCES +=                             \
  vnet/ethernet/p2p_ethernet_input.c            \
  vnet/ethernet/p2p_ethernet_api.c
 
-libvnet_multiversioning_files +=               \
+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                                \
@@ -262,6 +260,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
 
 ########################################
@@ -294,6 +295,9 @@ nobase_include_HEADERS +=                   \
   vnet/bonding/node.h                           \
   vnet/bonding/bond.api.h
 
+libvnet_multiversioning_sources +=             \
+  vnet/bonding/node.c
+
 API_FILES += vnet/bonding/bond.api
 
 ########################################
@@ -347,10 +351,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     \
@@ -413,6 +419,20 @@ API_FILES +=                                       \
  vnet/ip/rd_cp.api                              \
  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
 ########################################
@@ -445,7 +465,6 @@ libvnet_la_SOURCES +=                               \
  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_format.c                       \
  vnet/ipsec/esp_encrypt.c                      \
  vnet/ipsec/esp_decrypt.c                      \
@@ -483,37 +502,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
 ########################################
@@ -525,7 +513,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 +=                      \
@@ -533,6 +520,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
@@ -777,13 +765,26 @@ API_FILES += vnet/lisp-gpe/lisp_gpe.api
 libvnet_la_SOURCES +=                          \
  vnet/dhcp/client.c                            \
  vnet/dhcp/dhcp_client_detect.c                        \
+ vnet/dhcp/dhcp6_client_common_dp.c            \
+ vnet/dhcp/dhcp6_pd_client_dp.c                        \
+ vnet/dhcp/dhcp6_pd_client_cp.c                        \
+ vnet/dhcp/dhcp6_ia_na_client_dp.c             \
+ vnet/dhcp/dhcp6_ia_na_client_cp.c             \
  vnet/dhcp/dhcp_api.c
 
 nobase_include_HEADERS +=                      \
  vnet/dhcp/client.h                            \
- vnet/dhcp/dhcp.api.h
+ vnet/dhcp/dhcp6_client_common_dp.h            \
+ vnet/dhcp/dhcp6_pd_client_dp.h                        \
+ vnet/dhcp/dhcp6_ia_na_client_dp.h             \
+ vnet/dhcp/dhcp.api.h                          \
+ vnet/dhcp/dhcp6_pd_client_cp.api.h            \
+ vnet/dhcp/dhcp6_ia_na_client_cp.api.h
 
-API_FILES += vnet/dhcp/dhcp.api
+API_FILES +=                                   \
+ vnet/dhcp/dhcp.api                            \
+ vnet/dhcp/dhcp6_pd_client_cp.api              \
+ vnet/dhcp/dhcp6_ia_na_client_cp.api
 
 ########################################
 # DHCP proxy
@@ -929,16 +930,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
 
 ########################################
@@ -956,6 +963,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
 ########################################
@@ -1222,8 +1243,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
 ########################################
@@ -1280,10 +1305,10 @@ if CC_SUPPORTS_AVX2
 ###############################################################
 # AVX2
 ###############################################################
-libvnet_avx2_la_SOURCES = $(libvnet_multiversioning_files)
+libvnet_avx2_la_SOURCES = $(libvnet_multiversioning_sources)
 libvnet_avx2_la_CFLAGS =                       \
        $(AM_CFLAGS)  @CPU_AVX2_FLAGS@          \
-       -DCLIB_MULTIARCH_VARIANT=avx2
+       -DCLIB_MARCH_VARIANT=avx2
 noinst_LTLIBRARIES += libvnet_avx2.la
 libvnet_la_LIBADD += libvnet_avx2.la
 endif
@@ -1292,10 +1317,10 @@ if CC_SUPPORTS_AVX512
 ###############################################################
 # AVX512
 ###############################################################
-libvnet_avx512_la_SOURCES = $(libvnet_multiversioning_files)
+libvnet_avx512_la_SOURCES = $(libvnet_multiversioning_sources)
 libvnet_avx512_la_CFLAGS =                     \
        $(AM_CFLAGS) @CPU_AVX512_FLAGS@         \
-       -DCLIB_MULTIARCH_VARIANT=avx512
+       -DCLIB_MARCH_VARIANT=avx512
 noinst_LTLIBRARIES += libvnet_avx512.la
 libvnet_la_LIBADD += libvnet_avx512.la
 endif
Vector Packet Processing