X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2FMakefile.am;h=a5f47fc80dc1ba98603366fa095c7c3d11be5dad;hb=3a2a1c47bc1f319d1f46abd2a364b3cf82404405;hp=1b7b96911f958c967a3a16e3e8f55b344e0e1f05;hpb=6c3ebcc2bfd36a5835a99225ad667e4403293ffb;p=vpp.git diff --git a/vnet/Makefile.am b/vnet/Makefile.am index 1b7b96911f9..a5f47fc80dc 100644 --- a/vnet/Makefile.am +++ b/vnet/Makefile.am @@ -13,7 +13,17 @@ AUTOMAKE_OPTIONS = foreign subdir-objects -AM_CFLAGS = -Wall -Werror @DPDK@ @IPSEC@ @IPV6SR@ +AM_CFLAGS = -Wall -Werror @DPDK@ @DPDK_CRYPTO@ @IPSEC@ @IPV6SR@ + +BUILT_SOURCES = \ + vnet/interface.api.h \ + vnet/interface.api.json \ + vnet/l2/l2.api.h \ + vnet/l2/l2.api.json \ + vnet/map/map.api.h \ + vnet/map/map.api.json \ + vnet/span/span.api.h \ + vnet/span/span.api.json libvnet_la_SOURCES = libvnetplugin_la_SOURCES = @@ -31,8 +41,10 @@ endif ######################################## 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 \ @@ -44,15 +56,19 @@ 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.h \ + vnet/vnet_all_api_h.h \ + vnet/vnet_msg_enum.h ######################################## # Policer infra @@ -66,7 +82,6 @@ libvnet_la_SOURCES += \ nobase_include_HEADERS += \ vnet/policer/police.h \ vnet/policer/policer.h \ - vnet/policer/fix_types.h \ vnet/policer/xlate.h ######################################## @@ -109,6 +124,7 @@ nobase_include_HEADERS += \ ######################################## 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 \ @@ -142,7 +158,8 @@ nobase_include_HEADERS += \ vnet/l2/l2_fib.h \ vnet/l2/l2_rw.h \ vnet/l2/l2_xcrw.h \ - vnet/l2/l2_classify.h + vnet/l2/l2_classify.h \ + vnet/l2/l2.api.h ######################################## # Layer 2 protocol: SRP @@ -249,12 +266,15 @@ libvnet_la_SOURCES += \ 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/policer_classify.h \ + vnet/classify/flow_classify.h ######################################## # Layer 3 protocols go here @@ -267,16 +287,14 @@ libvnet_la_SOURCES += \ vnet/ip/format.c \ vnet/ip/icmp4.c \ vnet/ip/icmp6.c \ - vnet/ip/ip_feature_registration.c \ vnet/ip/ip46_cli.c \ - vnet/ip/ping.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_check.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 \ @@ -284,15 +302,17 @@ libvnet_la_SOURCES += \ vnet/ip/ip6_neighbor.c \ vnet/ip/ip6_pg.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 \ - vnet/ip/ip_input_acl.c \ - vnet/ip/ip_frag.c + vnet/ip/udp_pg.c nobase_include_HEADERS += \ vnet/ip/format.h \ @@ -300,25 +320,27 @@ nobase_include_HEADERS += \ vnet/ip/icmp4.h \ vnet/ip/icmp6.h \ vnet/ip/igmp_packet.h \ - vnet/ip/ip.h \ - vnet/ip/ip_feature_registration.h \ - vnet/ip/ip_source_and_port_range_check.h \ + vnet/ip/ip4_error.h \ vnet/ip/ip4.h \ vnet/ip/ip4_mtrie.h \ - vnet/ip/ip4_error.h \ vnet/ip/ip4_packet.h \ - vnet/ip/ip6.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/lookup.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.h \ vnet/ip/udp_error.def \ + vnet/ip/udp.h \ vnet/ip/udp_packet.h ######################################## @@ -340,7 +362,15 @@ libvnet_la_SOURCES += \ vnet/ipsec/ikev2_cli.c \ vnet/ipsec/ikev2_payload.c \ vnet/ipsec/ikev2_format.c -endif +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 @@ -350,6 +380,11 @@ nobase_include_HEADERS += \ vnet/ipsec/esp.h \ vnet/ipsec/ikev2.h \ vnet/ipsec/ikev2_priv.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 @@ -365,17 +400,19 @@ nobase_include_HEADERS += \ ######################################## # 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 +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 +nobase_include_HEADERS += \ + vnet/map/map.h \ + vnet/map/map_dpo.h \ + vnet/map/map.api.h if ENABLE_TESTS TESTS += test_map @@ -428,12 +465,13 @@ libvnet_la_SOURCES += \ vnet/mpls/mpls_features.c \ vnet/mpls/node.c \ vnet/mpls/interface.c \ - vnet/mpls/policy_encap.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 @@ -624,9 +662,21 @@ libvnet_la_SOURCES += \ vnet/lawful-intercept/node.c nobase_include_HEADERS += \ - vnet/dpdk_replication.h \ 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 + ######################################## # Packet generator ######################################## @@ -644,7 +694,7 @@ nobase_include_HEADERS += \ vnet/pg/edit.h ######################################## -# Intel DPDK +# DPDK ######################################## if WITH_DPDK libvnet_la_SOURCES += \ @@ -654,7 +704,6 @@ libvnet_la_SOURCES += \ vnet/devices/dpdk/init.c \ vnet/devices/dpdk/node.c \ vnet/devices/dpdk/hqos.c \ - vnet/devices/dpdk/vhost_user.c \ vnet/devices/dpdk/cli.c nobase_include_HEADERS += \ @@ -714,6 +763,17 @@ nobase_include_HEADERS += \ vnet/devices/netmap/netmap.h +######################################## +# 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 ######################################## @@ -757,9 +817,11 @@ libvnet_la_SOURCES += \ 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 += \ @@ -770,7 +832,8 @@ nobase_include_HEADERS += \ 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.h \ + vnet/fib/fib_entry_delegate.h ######################################## # ADJ @@ -798,6 +861,7 @@ nobase_include_HEADERS += \ 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 \ @@ -813,6 +877,7 @@ nobase_include_HEADERS += \ 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 ######################################## @@ -835,3 +900,19 @@ 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 = \ + vnet/interface.api.json \ + vnet/l2/l2.api.json \ + vnet/map/map.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