X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2FMakefile.am;h=41568e0604556f9f2bbfc1faf625b0f9b1826b15;hb=0bfe5d8c792abcdbcf27bfcc7b7b353fba04aee2;hp=f7c1f30b520da2e582d6dfe40384f01b2a5d5f0e;hpb=577c3553dd6939e998c78c5a389750aac3a67f8b;p=vpp.git diff --git a/vnet/Makefile.am b/vnet/Makefile.am index f7c1f30b520..41568e06045 100644 --- a/vnet/Makefile.am +++ b/vnet/Makefile.am @@ -13,7 +13,7 @@ AUTOMAKE_OPTIONS = foreign subdir-objects -AM_CFLAGS = -Wall @DPDK@ @VIRL@ @IPSEC@ @VCGN@ @IPV6SR@ +AM_CFLAGS = -Wall -Werror @DPDK@ @IPSEC@ @IPV6SR@ libvnet_la_SOURCES = libvnetplugin_la_SOURCES = @@ -21,11 +21,17 @@ nobase_include_HEADERS = noinst_PROGRAMS = TESTS = +dpdk_libs = +if WITH_DPDK +dpdk_libs += -l:libdpdk.a +endif + ######################################## # Generic stuff ######################################## libvnet_la_SOURCES += \ vnet/config.c \ + vnet/handoff.c \ vnet/interface.c \ vnet/interface_cli.c \ vnet/interface_format.c \ @@ -39,6 +45,7 @@ nobase_include_HEADERS += \ vnet/buffer.h \ vnet/config.h \ vnet/global_funcs.h \ + vnet/handoff.h \ vnet/interface.h \ vnet/interface_funcs.h \ vnet/l3_types.h \ @@ -58,6 +65,8 @@ libvnet_la_SOURCES += \ nobase_include_HEADERS += \ vnet/policer/police.h \ + vnet/policer/policer.h \ + vnet/policer/fix_types.h \ vnet/policer/xlate.h ######################################## @@ -102,7 +111,8 @@ libvnet_la_SOURCES += \ vnet/l2/feat_bitmap.c \ vnet/l2/l2_bd.c \ vnet/l2/l2_bvi.c \ - vnet/l2/l2_classify.c \ + vnet/l2/l2_input_classify.c \ + vnet/l2/l2_output_classify.c \ vnet/l2/l2_efp_filter.c \ vnet/l2/l2_fib.c \ vnet/l2/l2_flood.c \ @@ -219,6 +229,18 @@ libvnet_la_SOURCES += \ nobase_include_HEADERS += \ vnet/cdp/cdp_protocol.h +######################################## +# Layer 2 / LLDP +######################################## +libvnet_la_SOURCES += \ + vnet/lldp/lldp_input.c \ + vnet/lldp/lldp_node.c \ + vnet/lldp/lldp_output.c \ + vnet/lldp/lldp_cli.c + +nobase_include_HEADERS += \ + vnet/lldp/lldp_protocol.h + ######################################## # Layer 2/3 "classify" ######################################## @@ -226,11 +248,13 @@ libvnet_la_SOURCES += \ vnet/classify/vnet_classify.c \ vnet/classify/ip_classify.c \ vnet/classify/input_acl.c \ + vnet/classify/policer_classify.c \ vnet/classify/vnet_classify.h nobase_include_HEADERS += \ vnet/classify/vnet_classify.h \ - vnet/classify/input_acl.h + vnet/classify/input_acl.h \ + vnet/classify/policer_classify.h ######################################## # Layer 3 protocols go here @@ -240,18 +264,19 @@ nobase_include_HEADERS += \ # Layer 3 protocol: IP v4/v6 ######################################## libvnet_la_SOURCES += \ - vnet/ip/adj_alloc.c \ 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_hop_by_hop.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/ip6_format.c \ vnet/ip/ip6_forward.c \ vnet/ip/ip6_hop_by_hop.c \ @@ -270,13 +295,14 @@ libvnet_la_SOURCES += \ vnet/ip/ip_frag.c nobase_include_HEADERS += \ - vnet/ip/adj_alloc.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.h \ + vnet/ip/ip_feature_registration.h \ + vnet/ip/ip_source_and_port_range_check.h \ vnet/ip/ip4.h \ vnet/ip/ip4_mtrie.h \ vnet/ip/ip4_error.h \ @@ -341,17 +367,29 @@ nobase_include_HEADERS += \ ######################################## libvnet_la_SOURCES += \ vnet/map/map.c \ + vnet/map/map_dpo.c \ vnet/map/ip4_map.c \ vnet/map/ip6_map.c \ - vnet/map/sixrd.c \ - vnet/map/ip4_sixrd.c \ - vnet/map/ip6_sixrd.c \ vnet/map/ip4_map_t.c \ vnet/map/ip6_map_t.c nobase_include_HEADERS += \ vnet/map/map.h \ - vnet/map/sixrd.h + vnet/map/map_dpo.h + +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 -lvppinfra -lvlib \ + -lpthread -lvlibmemory -lvlibapi -lvlib_unix \ + -ldl -lsvm -lrt + +test_map_LDFLAGS = -static +endif + ######################################## # Tunnel protocol: gre @@ -384,45 +422,47 @@ nobase_include_HEADERS += \ # Tunnel protocol: gre+mpls ######################################## libvnet_la_SOURCES += \ - vnet/mpls-gre/mpls.c \ - vnet/mpls-gre/node.c \ - vnet/mpls-gre/interface.c \ - vnet/mpls-gre/policy_encap.c \ - vnet/mpls-gre/pg.c + vnet/mpls/mpls.c \ + vnet/mpls/mpls_lookup.c \ + vnet/mpls/mpls_output.c \ + vnet/mpls/mpls_features.c \ + vnet/mpls/node.c \ + vnet/mpls/interface.c \ + vnet/mpls/policy_encap.c \ + vnet/mpls/pg.c nobase_include_HEADERS += \ - vnet/mpls-gre/mpls.h \ - vnet/mpls-gre/packet.h \ - vnet/mpls-gre/error.def + vnet/mpls/mpls.h \ + vnet/mpls/mpls_types.h \ + vnet/mpls/packet.h \ + vnet/mpls/error.def ######################################## -# Tunnel protocol: nsh-gre +# Tunnel protocol: vxlan-gpe ######################################## libvnet_la_SOURCES += \ - vnet/nsh-gre/nsh_gre.c \ - vnet/nsh-gre/encap.c \ - vnet/nsh-gre/decap.c + vnet/vxlan-gpe/vxlan_gpe.c \ + vnet/vxlan-gpe/encap.c \ + vnet/vxlan-gpe/decap.c nobase_include_HEADERS += \ - vnet/nsh-gre/nsh_gre.h \ - vnet/nsh-gre/nsh_gre_packet.h \ - vnet/nsh-gre/nsh_gre_error.def + vnet/vxlan-gpe/vxlan_gpe.h \ + vnet/vxlan-gpe/vxlan_gpe_packet.h \ + vnet/vxlan-gpe/vxlan_gpe_error.def ######################################## -# Tunnel protocol: nsh-vxlan-gpe +# Tunnel protocol: ipsec+gre ######################################## - libvnet_la_SOURCES += \ - vnet/nsh-vxlan-gpe/nsh_vxlan_gpe.c \ - vnet/nsh-vxlan-gpe/encap.c \ - vnet/nsh-vxlan-gpe/decap.c + vnet/ipsec-gre/ipsec_gre.c \ + vnet/ipsec-gre/node.c \ + vnet/ipsec-gre/interface.c nobase_include_HEADERS += \ - vnet/nsh-vxlan-gpe/nsh_vxlan_gpe.h \ - vnet/nsh-vxlan-gpe/vxlan_gpe_packet.h \ - vnet/nsh-vxlan-gpe/nsh_vxlan_gpe_error.def + vnet/ipsec-gre/ipsec_gre.h \ + vnet/ipsec-gre/error.def ######################################## # LISP control plane: lisp-cp @@ -430,6 +470,7 @@ nobase_include_HEADERS += \ libvnet_la_SOURCES += \ vnet/lisp-cp/lisp_types.c \ + vnet/lisp-cp/lisp_cp_dpo.c \ vnet/lisp-cp/control.c \ vnet/lisp-cp/gid_dictionary.c \ vnet/lisp-cp/lisp_msg_serdes.c \ @@ -445,7 +486,7 @@ nobase_include_HEADERS += \ if ENABLE_TESTS -LDS = -lvppinfra -l:libvlib.a -l:libdpdk.a -l:libvlibmemory.a \ +LDS = -lvppinfra -l:libvlib.a $(dpdk_libs) -l:libvlibmemory.a \ -l:libvlibapi.a -l:libsvm.a -lpthread -ldl -lrt -lm -l:libvlib_unix.a TESTS += test_cp_serdes test_lisp_types @@ -477,7 +518,11 @@ endif libvnet_la_SOURCES += \ vnet/lisp-gpe/lisp_gpe.c \ + vnet/lisp-gpe/lisp_gpe_sub_interface.c \ + vnet/lisp-gpe/lisp_gpe_adjacency.c \ + vnet/lisp-gpe/lisp_gpe_tunnel.c \ vnet/lisp-gpe/interface.c \ + vnet/lisp-gpe/ip_forward.c \ vnet/lisp-gpe/decap.c nobase_include_HEADERS += \ @@ -526,7 +571,8 @@ nobase_include_HEADERS += \ if WITH_IPV6SR libvnet_la_SOURCES += \ - vnet/sr/sr.c + vnet/sr/sr.c \ + vnet/sr/sr_replicate.c endif nobase_include_HEADERS += \ @@ -534,41 +580,6 @@ nobase_include_HEADERS += \ vnet/sr/sr_error.def \ vnet/sr/sr.h -######################################## -# CGN -######################################### - -if WITH_VCGN -libvnet_la_SOURCES += \ - vnet/vcgn/cnat_bulk_port.c \ - vnet/vcgn/cnat_config.c \ - vnet/vcgn/cnat_db_scanner.c \ - vnet/vcgn/cnat_db_v2.c \ - vnet/vcgn/cnat_debug_msg_handler.c \ - vnet/vcgn/cnat_cli_handler.c \ - vnet/vcgn/cnat_global.c \ - vnet/vcgn/cnat_ipv4_udp_inside_input.c \ - vnet/vcgn/cnat_ipv4_udp_inside_input_exceptions.c \ - vnet/vcgn/cnat_ipv4_udp_outside_input.c \ - vnet/vcgn/cnat_ipv4_tcp_inside_input.c \ - vnet/vcgn/cnat_ipv4_tcp_inside_input_exceptions.c \ - vnet/vcgn/cnat_ipv4_tcp_outside_input.c \ - vnet/vcgn/cnat_ipv4_icmp_query_inside_input.c \ - vnet/vcgn/cnat_ipv4_icmp_query_inside_input_exception.c \ - vnet/vcgn/cnat_ipv4_icmp_query_outside_input.c \ - vnet/vcgn/cnat_ipv4_icmp_error_inside_input.c \ - vnet/vcgn/cnat_ipv4_icmp_error_outside_input.c \ - vnet/vcgn/cnat_logging.c \ - vnet/vcgn/cnat_ports.c \ - vnet/vcgn/cnat_util.c \ - vnet/vcgn/cnat_show.c \ - vnet/vcgn/cnat_syslog.c \ - vnet/vcgn/cnat_v4_functions.c \ - vnet/vcgn/index_list.c \ - vnet/vcgn/spp_platform_trace_log.c \ - vnet/vcgn/vcgn_classify.c -endif - ######################################## # DHCPv6 proxy ######################################## @@ -592,14 +603,14 @@ nobase_include_HEADERS += \ vnet/flow/ipfix_packet.h ######################################## -# IPFIX sample code +# IPFIX classify code ######################################## libvnet_la_SOURCES += \ - vnet/flow/flow_report_sample.c + vnet/flow/flow_report_classify.c nobase_include_HEADERS += \ - vnet/flow/flow_report_sample.h + vnet/flow/flow_report_classify.h ######################################## # lawful intercept @@ -639,26 +650,28 @@ libvnet_la_SOURCES += \ vnet/devices/dpdk/format.c \ vnet/devices/dpdk/init.c \ vnet/devices/dpdk/node.c \ - vnet/devices/dpdk/threads.c \ vnet/devices/dpdk/vhost_user.c \ vnet/devices/dpdk/cli.c nobase_include_HEADERS += \ - vnet/devices/dpdk/dpdk.h \ - vnet/devices/dpdk/threads.h + vnet/devices/dpdk/dpdk.h +else +libvnet_la_SOURCES += \ + vnet/devices/nic/ixge.c \ + vnet/devices/nic/ixge.h \ + vnet/devices/nic/sfp.c \ + vnet/devices/nic/sfp.h endif ######################################## # virtio ######################################## -if WITH_DPDK libvnet_la_SOURCES += \ vnet/devices/virtio/vhost-user.c nobase_include_HEADERS += \ vnet/devices/virtio/vhost-user.h -endif WITH_DPDK ######################################## # ssvm ethernet @@ -683,6 +696,20 @@ libvnet_la_SOURCES += \ nobase_include_HEADERS += \ vnet/devices/af_packet/af_packet.h +######################################## +# NETMAP interface +######################################## + +libvnet_la_SOURCES += \ + vnet/devices/netmap/netmap.c \ + vnet/devices/netmap/device.c \ + vnet/devices/netmap/node.c \ + vnet/devices/netmap/cli.c + +nobase_include_HEADERS += \ + vnet/devices/netmap/netmap.h + + ######################################## # Unix kernel related ######################################## @@ -700,6 +727,90 @@ nobase_include_HEADERS += \ vnet/unix/tuntap.h \ vnet/unix/tapcli.h +######################################## +# FIB +######################################## + +libvnet_la_SOURCES += \ + vnet/fib/fib.c \ + vnet/fib/fib_test.c \ + vnet/fib/ip4_fib.c \ + vnet/fib/ip6_fib.c \ + vnet/fib/mpls_fib.c \ + vnet/fib/fib_table.c \ + vnet/fib/fib_walk.c \ + vnet/fib/fib_types.c \ + vnet/fib/fib_node.c \ + vnet/fib/fib_node_list.c \ + vnet/fib/fib_entry.c \ + vnet/fib/fib_entry_src.c \ + vnet/fib/fib_entry_src_rr.c \ + vnet/fib/fib_entry_src_interface.c \ + vnet/fib/fib_entry_src_default_route.c \ + vnet/fib/fib_entry_src_special.c \ + vnet/fib/fib_entry_src_api.c \ + vnet/fib/fib_entry_src_adj.c \ + vnet/fib/fib_entry_src_mpls.c \ + vnet/fib/fib_entry_src_lisp.c \ + vnet/fib/fib_entry_cover.c \ + vnet/fib/fib_path_list.c \ + vnet/fib/fib_path.c \ + vnet/fib/fib_path_ext.c \ + vnet/fib/fib_attached_export.c + +nobase_include_HEADERS += \ + vnet/fib/fib.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 + +######################################## +# ADJ +######################################## + +libvnet_la_SOURCES += \ + vnet/adj/adj_alloc.c \ + vnet/adj/adj_nbr.c \ + vnet/adj/adj_rewrite.c \ + vnet/adj/adj_glean.c \ + vnet/adj/adj_midchain.c \ + vnet/adj/adj.c + +nobase_include_HEADERS += \ + vnet/adj/adj.h \ + vnet/adj/adj_types.h \ + vnet/adj/adj_rewrite.h \ + vnet/adj/adj_glean.h \ + vnet/adj/adj_nbr.h + +######################################## +# Data-Plane Objects +######################################## + +libvnet_la_SOURCES += \ + vnet/dpo/dpo.c \ + vnet/dpo/drop_dpo.c \ + vnet/dpo/punt_dpo.c \ + vnet/dpo/receive_dpo.c \ + vnet/dpo/load_balance.c \ + vnet/dpo/load_balance_map.c \ + vnet/dpo/lookup_dpo.c \ + vnet/dpo/classify_dpo.c \ + vnet/dpo/mpls_label_dpo.c + +nobase_include_HEADERS += \ + vnet/dpo/load_balance.h \ + vnet/dpo/drop_dpo.h \ + vnet/dpo/lookup_dpo.h \ + vnet/dpo/punt_dpo.h \ + vnet/dpo/classify_dpo.h \ + vnet/dpo/receive_dpo.h \ + vnet/dpo/dpo.h + ######################################## # Plugin client library ######################################## @@ -712,12 +823,6 @@ nobase_include_HEADERS += \ lib_LTLIBRARIES = libvnet.la libvnetplugin.la -dpdk_libs = - -if WITH_DPDK -dpdk_libs += -l:libdpdk.a -endif - pcap2pg_SOURCES = \ vnet/unix/pcap2pg.c \ vnet/unix/pcap.h @@ -726,5 +831,3 @@ pcap2pg_LDFLAGS = -static pcap2pg_LDADD = libvnet.la -l:libvppinfra.a -lpthread -lm -ldl noinst_PROGRAMS += pcap2pg - -