X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2FCMakeLists.txt;h=18e162030b0dcc7f1b899b94b0747277e03c1b01;hb=refs%2Fchanges%2F49%2F33449%2F9;hp=e387d25f9133ece0a62250bbfbe6381257a0819a;hpb=df87f8092f5b6b54eef0d5acf3c27c2e398a401a;p=vpp.git diff --git a/src/vnet/CMakeLists.txt b/src/vnet/CMakeLists.txt index e387d25f913..18e162030b0 100644 --- a/src/vnet/CMakeLists.txt +++ b/src/vnet/CMakeLists.txt @@ -11,14 +11,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -add_definitions (-DWITH_LIBSSL=1) -include_directories(${OPENSSL_INCLUDE_DIR}) - unset(VNET_SOURCES) unset(VNET_HEADERS) unset(VNET_API_FILES) unset(VNET_MULTIARCH_SOURCES) +option(VPP_IP_FIB_MTRIE_16 "IP FIB's MTRIE Stride is 16-8-8 (if not set it's 8-8-8-8)" ON) + ############################################################################## # Generic stuff ############################################################################## @@ -36,6 +35,9 @@ list(APPEND VNET_SOURCES interface_cli.c interface_format.c interface_output.c + interface/rx_queue.c + interface/tx_queue.c + interface/runtime.c interface_stats.c misc.c ) @@ -55,6 +57,8 @@ list(APPEND VNET_HEADERS flow/flow.h global_funcs.h handoff.h + interface/rx_queue_funcs.h + interface/tx_queue_funcs.h interface.h interface_funcs.h interface_output.h @@ -65,12 +69,11 @@ list(APPEND VNET_HEADERS plugin/plugin.h pipeline.h vnet.h - vnet_all_api_h.h - vnet_msg_enum.h util/radix.h util/refcount.h format_fns.h ip/ip_format_fns.h + ip/ip_sas.h ethernet/ethernet_format_fns.h ) @@ -107,16 +110,6 @@ list(APPEND VNET_API_FILES policer/policer_types.api ) -############################################################################## -# Binary API compatibility until vpp 20.12, see the ADL plugin... -############################################################################## - -list(APPEND VNET_SOURCES - cop/cop_api.c -) - -list(APPEND VNET_API_FILES cop/cop.api) - ############################################################################## # Layer 2 protocols go here ############################################################################## @@ -412,6 +405,8 @@ list(APPEND VNET_SOURCES ip/ip_interface.c ip/ip_init.c ip/ip_in_out_acl.c + ip/ip_path_mtu.c + ip/ip_path_mtu_node.c ip/ip_punt_drop.c ip/ip_types.c ip/lookup.c @@ -419,6 +414,7 @@ list(APPEND VNET_SOURCES ip/punt.c ip/punt_node.c ip/vtep.c + ip/ip_sas.c ) list(APPEND VNET_MULTIARCH_SOURCES @@ -434,6 +430,7 @@ list(APPEND VNET_MULTIARCH_SOURCES ip/ip6_punt_drop.c ip/punt_node.c ip/ip_in_out_acl.c + ip/ip_path_mtu_node.c ) list(APPEND VNET_HEADERS @@ -665,6 +662,7 @@ list(APPEND VNET_SOURCES udp/udp_pg.c udp/udp_encap_node.c udp/udp_encap.c + udp/udp_decap.c udp/udp_api.c ) @@ -1170,7 +1168,10 @@ list(APPEND VNET_HEADERS list(APPEND VNET_SOURCES fib/fib.c + fib/ip4_fib_hash.c fib/ip4_fib.c + fib/ip4_fib_16.c + fib/ip4_fib_8.c fib/ip6_fib.c fib/mpls_fib.c fib/fib_table.c @@ -1195,6 +1196,7 @@ list(APPEND VNET_SOURCES fib/fib_path_list.c fib/fib_path.c fib/fib_path_ext.c + fib/fib_sas.c fib/fib_source.c fib/fib_urpf_list.c fib/fib_attached_export.c @@ -1213,10 +1215,14 @@ list(APPEND VNET_HEADERS fib/fib_node_list.h fib/fib_entry.h fib/fib_entry_delegate.h + fib/fib_sas.h fib/fib_source.h ) -list(APPEND VNET_API_FILES fib/fib_types.api) +list(APPEND VNET_API_FILES + fib/fib_types.api + fib/fib.api +) ############################################################################## # ADJ @@ -1226,6 +1232,7 @@ list(APPEND VNET_SOURCES adj/adj_nbr.c adj/adj_glean.c adj/adj_midchain.c + adj/adj_midchain_node.c adj/adj_midchain_delegate.c adj/adj_mcast.c adj/adj_l2.c @@ -1239,7 +1246,7 @@ list(APPEND VNET_SOURCES list(APPEND VNET_MULTIARCH_SOURCES adj/adj_nsh.c adj/adj_l2.c - adj/adj_midchain.c + adj/adj_midchain_node.c ) list(APPEND VNET_HEADERS @@ -1338,7 +1345,6 @@ list(APPEND VNET_SOURCES util/radix.c util/refcount.c util/throttle.c - util/trajectory.c ) list(APPEND VNET_HEADERS @@ -1486,7 +1492,7 @@ add_vpp_library(vnet MULTIARCH_SOURCES ${VNET_MULTIARCH_SOURCES} INSTALL_HEADERS ${VNET_HEADERS} API_FILES ${VNET_API_FILES} - LINK_LIBRARIES vppinfra svm vlib ${OPENSSL_LIBRARIES} + LINK_LIBRARIES vppinfra svm vlib DEPENDS vpp_version_h api_headers )