X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2FMakefile.am;h=e871b1c37ad9b5412c072b412ce89790842d4087;hb=f07dc9e236506f50a0230e6680cf1402dea6a976;hp=bff8418fb6eefeac95aaa49582bd8efe44299dc1;hpb=770930c45f9793151e2c39b5834b1c8e7210bbe6;p=vpp.git diff --git a/vnet/Makefile.am b/vnet/Makefile.am index bff8418fb6e..e871b1c37ad 100644 --- a/vnet/Makefile.am +++ b/vnet/Makefile.am @@ -13,7 +13,29 @@ AUTOMAKE_OPTIONS = foreign subdir-objects -AM_CFLAGS = -Wall -Werror @DPDK@ @IPSEC@ @IPV6SR@ +AM_CFLAGS = -Wall -Werror @DPDK@ @DPDK_CRYPTO@ @IPSEC@ @IPV6SR@ + +BUILT_SOURCES = \ + vnet/devices/af_packet/af_packet.api.h \ + vnet/devices/af_packet/af_packet.api.json \ + vnet/devices/netmap/netmap.api.h \ + vnet/devices/netmap/netmap.api.json \ + vnet/devices/virtio/vhost_user.api.h \ + vnet/devices/virtio/vhost_user.api.json \ + vnet/interface.api.h \ + vnet/interface.api.json \ + vnet/ip/ip.api.h \ + vnet/ip/ip.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 \ + vnet/unix/tap.api.h \ + vnet/unix/tap.api.json \ + vnet/vxlan/vxlan.api.h \ + vnet/vxlan/vxlan.api.json libvnet_la_SOURCES = libvnetplugin_la_SOURCES = @@ -31,8 +53,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 +68,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 +94,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 +136,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 +170,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 @@ -211,12 +240,14 @@ nobase_include_HEADERS += \ libvnet_la_SOURCES += \ vnet/vxlan/vxlan.c \ vnet/vxlan/encap.c \ - vnet/vxlan/decap.c + vnet/vxlan/decap.c \ + vnet/vxlan/vxlan_api.c nobase_include_HEADERS += \ vnet/vxlan/vxlan.h \ vnet/vxlan/vxlan_packet.h \ - vnet/vxlan/vxlan_error.def + vnet/vxlan/vxlan_error.def \ + vnet/vxlan/vxlan.api.h ######################################## # Layer 2 / CDP @@ -267,7 +298,6 @@ nobase_include_HEADERS += \ # Layer 3 protocol: IP v4/v6 ######################################## libvnet_la_SOURCES += \ - vnet/ip/feature_registration.c \ vnet/ip/format.c \ vnet/ip/icmp4.c \ vnet/ip/icmp6.c \ @@ -285,6 +315,7 @@ libvnet_la_SOURCES += \ vnet/ip/ip6_input.c \ vnet/ip/ip6_neighbor.c \ vnet/ip/ip6_pg.c \ + vnet/ip/ip_api.c \ vnet/ip/ip_checksum.c \ vnet/ip/ip_frag.c \ vnet/ip/ip.h \ @@ -299,12 +330,12 @@ libvnet_la_SOURCES += \ vnet/ip/udp_pg.c nobase_include_HEADERS += \ - vnet/ip/feature_registration.h \ vnet/ip/format.h \ vnet/ip/icmp46_packet.h \ vnet/ip/icmp4.h \ vnet/ip/icmp6.h \ vnet/ip/igmp_packet.h \ + vnet/ip/ip.api.h \ vnet/ip/ip4_error.h \ vnet/ip/ip4.h \ vnet/ip/ip4_mtrie.h \ @@ -314,6 +345,7 @@ nobase_include_HEADERS += \ vnet/ip/ip6_hop_by_hop.h \ vnet/ip/ip6_hop_by_hop_packet.h \ vnet/ip/ip6_packet.h \ + vnet/ip/ip6_neighbor.h \ vnet/ip/ip.h \ vnet/ip/ip_packet.h \ vnet/ip/ip_source_and_port_range_check.h \ @@ -327,6 +359,22 @@ nobase_include_HEADERS += \ vnet/ip/udp.h \ vnet/ip/udp_packet.h +######################################## +# Bidirectional Forwarding Detection +######################################## + +nobase_include_HEADERS += \ + vnet/bfd/bfd_protocol.h \ + vnet/bfd/bfd_main.h \ + vnet/bfd/bfd_api.h \ + vnet/bfd/bfd_udp.h + +libvnet_la_SOURCES += \ + vnet/bfd/bfd_api.h \ + vnet/bfd/bfd_udp.c \ + vnet/bfd/bfd_main.c \ + vnet/bfd/bfd_protocol.c + ######################################## # Layer 3 protocol: IPSec ######################################## @@ -346,7 +394,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 @@ -356,6 +412,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 @@ -371,17 +432,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 @@ -434,12 +497,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 @@ -630,9 +694,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 ######################################## @@ -650,7 +726,7 @@ nobase_include_HEADERS += \ vnet/pg/edit.h ######################################## -# Intel DPDK +# DPDK ######################################## if WITH_DPDK libvnet_la_SOURCES += \ @@ -660,7 +736,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 += \ @@ -678,10 +753,12 @@ endif ######################################## libvnet_la_SOURCES += \ - vnet/devices/virtio/vhost-user.c + vnet/devices/virtio/vhost-user.c \ + vnet/devices/virtio/vhost_user_api.c nobase_include_HEADERS += \ - vnet/devices/virtio/vhost-user.h + vnet/devices/virtio/vhost-user.h \ + vnet/devices/virtio/vhost_user.api.h ######################################## # ssvm ethernet @@ -701,10 +778,12 @@ libvnet_la_SOURCES += \ vnet/devices/af_packet/af_packet.c \ vnet/devices/af_packet/device.c \ vnet/devices/af_packet/node.c \ - vnet/devices/af_packet/cli.c + vnet/devices/af_packet/cli.c \ + vnet/devices/af_packet/af_packet_api.c -nobase_include_HEADERS += \ - vnet/devices/af_packet/af_packet.h +nobase_include_HEADERS += \ + vnet/devices/af_packet/af_packet.h \ + vnet/devices/af_packet/af_packet.api.h ######################################## # NETMAP interface @@ -714,11 +793,23 @@ libvnet_la_SOURCES += \ vnet/devices/netmap/netmap.c \ vnet/devices/netmap/device.c \ vnet/devices/netmap/node.c \ - vnet/devices/netmap/cli.c + vnet/devices/netmap/cli.c \ + vnet/devices/netmap/netmap_api.c nobase_include_HEADERS += \ - vnet/devices/netmap/netmap.h + vnet/devices/netmap/netmap.h \ + vnet/devices/netmap/netmap.api.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 @@ -729,12 +820,14 @@ nobase_include_HEADERS += \ libvnet_la_SOURCES += \ vnet/unix/gdb_funcs.c \ vnet/unix/pcap.c \ + vnet/unix/tap_api.c \ vnet/unix/tapcli.c \ vnet/unix/tuntap.c nobase_include_HEADERS += \ vnet/unix/pcap.h \ vnet/unix/tuntap.h \ + vnet/unix/tap.api.h \ vnet/unix/tapcli.h ######################################## @@ -763,6 +856,7 @@ 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 \ @@ -771,13 +865,15 @@ libvnet_la_SOURCES += \ nobase_include_HEADERS += \ vnet/fib/fib.h \ + vnet/fib/fib_api.h \ vnet/fib/ip4_fib.h \ vnet/fib/ip6_fib.h \ vnet/fib/fib_types.h \ 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 @@ -805,6 +901,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 \ @@ -820,6 +917,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 ######################################## @@ -842,3 +940,27 @@ 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/devices/af_packet/af_packet.api.json \ + vnet/devices/netmap/netmap.api.json \ + vnet/devices/virtio/vhost_user.api.json \ + vnet/interface.api.json \ + vnet/ip/ip.api.json \ + vnet/l2/l2.api.json \ + vnet/map/map.api.json \ + vnet/span/span.api.json \ + vnet/unix/tap.api.json \ + vnet/vxlan/vxlan.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