X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2FMakefile.am;h=37798c9c3bb53cbca0c6ea4c19477a8cfd2ee5da;hb=c4d1cf76072b54f630b0263cd86e01df82249568;hp=6aa4254f2af86acb75b97a6f5f2269268e0d647d;hpb=5e575b1d59a5a4c1590ca09d6383a876fb9fdd25;p=vpp.git diff --git a/vnet/Makefile.am b/vnet/Makefile.am index 6aa4254f2af..37798c9c3bb 100644 --- a/vnet/Makefile.am +++ b/vnet/Makefile.am @@ -13,7 +13,35 @@ 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/gre/gre.api.h \ + vnet/gre/gre.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/l2tp/l2tp.api.h \ + vnet/l2tp/l2tp.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 \ + vnet/vxlan-gpe/vxlan_gpe.api.h \ + vnet/vxlan-gpe/vxlan_gpe.api.json libvnet_la_SOURCES = libvnetplugin_la_SOURCES = @@ -31,8 +59,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 +74,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 +100,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 +142,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 +176,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 +246,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 @@ -249,12 +286,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,32 +307,33 @@ 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 \ 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 \ 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,27 +341,46 @@ 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/ip.api.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 +######################################## +# 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 ######################################## @@ -340,7 +400,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 +418,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 +438,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 @@ -398,12 +473,14 @@ libvnet_la_SOURCES += \ vnet/gre/gre.c \ vnet/gre/node.c \ vnet/gre/interface.c \ - vnet/gre/pg.c + vnet/gre/pg.c \ + vnet/gre/gre_api.c nobase_include_HEADERS += \ vnet/gre/gre.h \ vnet/gre/packet.h \ - vnet/gre/error.def + vnet/gre/error.def \ + vnet/gre/gre.api.h ######################################## # Tunnel protocol: l2tpv3 @@ -412,11 +489,13 @@ libvnet_la_SOURCES += \ vnet/l2tp/l2tp.c \ vnet/l2tp/encap.c \ vnet/l2tp/decap.c \ - vnet/l2tp/pg.c + vnet/l2tp/pg.c \ + vnet/l2tp/l2tp_api.c nobase_include_HEADERS += \ vnet/l2tp/l2tp.h \ - vnet/l2tp/packet.h + vnet/l2tp/packet.h \ + vnet/l2tp/l2tp.api.h ######################################## # Tunnel protocol: gre+mpls @@ -428,12 +507,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 @@ -445,12 +525,14 @@ nobase_include_HEADERS += \ libvnet_la_SOURCES += \ vnet/vxlan-gpe/vxlan_gpe.c \ vnet/vxlan-gpe/encap.c \ - vnet/vxlan-gpe/decap.c + vnet/vxlan-gpe/decap.c \ + vnet/vxlan-gpe/vxlan_gpe_api.c nobase_include_HEADERS += \ vnet/vxlan-gpe/vxlan_gpe.h \ vnet/vxlan-gpe/vxlan_gpe_packet.h \ - vnet/vxlan-gpe/vxlan_gpe_error.def + vnet/vxlan-gpe/vxlan_gpe_error.def \ + vnet/vxlan-gpe/vxlan_gpe.api.h ######################################## # Tunnel protocol: ipsec+gre @@ -624,9 +706,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 +738,7 @@ nobase_include_HEADERS += \ vnet/pg/edit.h ######################################## -# Intel DPDK +# DPDK ######################################## if WITH_DPDK libvnet_la_SOURCES += \ @@ -654,7 +748,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 += \ @@ -672,10 +765,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 @@ -695,10 +790,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 @@ -708,11 +805,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 @@ -723,12 +832,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 ######################################## @@ -757,27 +868,30 @@ 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 += \ 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 ######################################## libvnet_la_SOURCES += \ - vnet/adj/adj_alloc.c \ vnet/adj/adj_nbr.c \ vnet/adj/adj_rewrite.c \ vnet/adj/adj_glean.c \ @@ -799,6 +913,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 \ @@ -814,6 +929,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 ######################################## @@ -836,3 +952,30 @@ 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/gre/gre.api.json \ + vnet/interface.api.json \ + vnet/ip/ip.api.json \ + vnet/l2/l2.api.json \ + vnet/l2tp/l2tp.api.json \ + vnet/map/map.api.json \ + vnet/span/span.api.json \ + vnet/unix/tap.api.json \ + vnet/vxlan/vxlan.api.json \ + vnet/vxlan-gpe/vxlan_gpe.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