X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=8f884748d0f3071162ea6ed99188d7bc594f55f3;hb=75e7d13;hp=76824fdb2629287d55c35c0449f0b78832710c82;hpb=c74a86af08ae9cf312c47ad4dad54d70ae3093ed;p=vpp.git diff --git a/src/vnet.am b/src/vnet.am index 76824fdb262..8f884748d0f 100644 --- a/src/vnet.am +++ b/src/vnet.am @@ -19,14 +19,11 @@ libvnet_la_DEPENDENCIES = \ libvlib.la \ libsvmdb.la \ libsvm.la \ - libvlibapi.la \ - libvlibmemory.la \ - libvlibmemoryclient.la + libvlibmemory.la -libvnet_la_LIBADD = $(libvnet_la_DEPENDENCIES) -lm -lpthread -ldl -lrt $(DPDK_LD_ADD) -libvnet_la_LDFLAGS = $(DPDK_LD_FLAGS) +libvnet_la_LIBADD = $(libvnet_la_DEPENDENCIES) -lm -lpthread -ldl -lrt -if WITH_IPV6SR +if WITH_LIBSSL libvnet_la_LIBADD += -lcrypto endif @@ -34,8 +31,10 @@ endif # Generic stuff ######################################## libvnet_la_SOURCES += \ + vnet/buffer.c \ vnet/config.c \ vnet/devices/devices.c \ + vnet/devices/netlink.c \ vnet/handoff.c \ vnet/interface.c \ vnet/interface_api.c \ @@ -43,26 +42,29 @@ libvnet_la_SOURCES += \ vnet/interface_format.c \ vnet/interface_output.c \ vnet/misc.c \ - vnet/replication.c \ - vnet/rewrite.c + vnet/replication.c nobase_include_HEADERS += \ vnet/api_errno.h \ vnet/buffer.h \ vnet/config.h \ vnet/devices/devices.h \ + vnet/devices/netlink.h \ vnet/global_funcs.h \ vnet/handoff.h \ vnet/interface.h \ vnet/interface.api.h \ vnet/interface_funcs.h \ + vnet/ip/ip4_to_ip6.h \ + vnet/ip/ip6_to_ip4.h \ vnet/l3_types.h \ vnet/pipeline.h \ vnet/replication.h \ - vnet/rewrite.h \ vnet/vnet.h \ vnet/vnet_all_api_h.h \ - vnet/vnet_msg_enum.h + vnet/vnet_msg_enum.h \ + vnet/util/radix.h \ + vnet/util/refcount.h API_FILES += vnet/interface.api @@ -73,12 +75,16 @@ API_FILES += vnet/interface.api libvnet_la_SOURCES += \ vnet/policer/node_funcs.c \ vnet/policer/policer.c \ - vnet/policer/xlate.c + vnet/policer/xlate.c \ + vnet/policer/policer_api.c nobase_include_HEADERS += \ vnet/policer/police.h \ vnet/policer/policer.h \ - vnet/policer/xlate.h + vnet/policer/xlate.h \ + vnet/policer/policer.api.h + +API_FILES += vnet/policer/policer.api ######################################## # Cop - junk filter @@ -88,10 +94,14 @@ libvnet_la_SOURCES += \ vnet/cop/cop.c \ vnet/cop/node1.c \ vnet/cop/ip4_whitelist.c \ - vnet/cop/ip6_whitelist.c + vnet/cop/ip6_whitelist.c \ + vnet/cop/cop_api.c nobase_include_HEADERS += \ - vnet/cop/cop.h + vnet/cop/cop.h \ + vnet/cop/cop.api.h + +API_FILES += vnet/cop/cop.api ######################################## # Layer 2 protocols go here @@ -106,14 +116,23 @@ libvnet_la_SOURCES += \ vnet/ethernet/init.c \ vnet/ethernet/interface.c \ vnet/ethernet/node.c \ - vnet/ethernet/pg.c + vnet/ethernet/pg.c \ + vnet/ethernet/sfp.c \ + vnet/ethernet/p2p_ethernet.c \ + vnet/ethernet/p2p_ethernet_input.c \ + vnet/ethernet/p2p_ethernet_api.c nobase_include_HEADERS += \ vnet/ethernet/arp_packet.h \ vnet/ethernet/error.def \ vnet/ethernet/ethernet.h \ vnet/ethernet/packet.h \ - vnet/ethernet/types.def + vnet/ethernet/types.def \ + vnet/ethernet/sfp.h \ + vnet/ethernet/p2p_ethernet.api.h \ + vnet/ethernet/p2p_ethernet.h + +API_FILES += vnet/ethernet/p2p_ethernet.api ######################################## # Layer 2 protocol: Ethernet bridging @@ -237,6 +256,23 @@ nobase_include_HEADERS += \ API_FILES += vnet/vxlan/vxlan.api +######################################## +# Layer 2 / Geneve +######################################## +libvnet_la_SOURCES += \ + vnet/geneve/geneve.c \ + vnet/geneve/encap.c \ + vnet/geneve/decap.c \ + vnet/geneve/geneve_api.c + +nobase_include_HEADERS += \ + vnet/geneve/geneve.h \ + vnet/geneve/geneve_packet.h \ + vnet/geneve/geneve_error.def \ + vnet/geneve/geneve.api.h + +API_FILES += vnet/geneve/geneve.api + ######################################## # Layer 2 / CDP ######################################## @@ -255,10 +291,15 @@ libvnet_la_SOURCES += \ vnet/lldp/lldp_input.c \ vnet/lldp/lldp_node.c \ vnet/lldp/lldp_output.c \ - vnet/lldp/lldp_cli.c + vnet/lldp/lldp_cli.c \ + vnet/lldp/lldp_api.c nobase_include_HEADERS += \ - vnet/lldp/lldp_protocol.h + vnet/lldp/lldp_protocol.h \ + vnet/lldp/lldp.h \ + vnet/lldp/lldp.api.h + +API_FILES += vnet/lldp/lldp.api ######################################## # Layer 2/3 "classify" @@ -270,13 +311,17 @@ libvnet_la_SOURCES += \ vnet/classify/policer_classify.c \ vnet/classify/flow_classify.c \ vnet/classify/flow_classify_node.c \ - vnet/classify/vnet_classify.h + vnet/classify/vnet_classify.h \ + vnet/classify/classify_api.c nobase_include_HEADERS += \ vnet/classify/vnet_classify.h \ vnet/classify/input_acl.h \ vnet/classify/policer_classify.h \ - vnet/classify/flow_classify.h + vnet/classify/flow_classify.h \ + vnet/classify/classify.api.h + +API_FILES += vnet/classify/classify.api ######################################## # Layer 3 protocols go here @@ -292,30 +337,31 @@ libvnet_la_SOURCES += \ vnet/ip/ip46_cli.c \ vnet/ip/ip4_format.c \ vnet/ip/ip4_forward.c \ + vnet/ip/ip4_punt_drop.c \ vnet/ip/ip4_input.c \ vnet/ip/ip4_mtrie.c \ vnet/ip/ip4_pg.c \ vnet/ip/ip4_source_and_port_range_check.c \ vnet/ip/ip4_source_check.c \ + vnet/ip/ip4_reassembly.c \ vnet/ip/ip6_format.c \ vnet/ip/ip6_forward.c \ + vnet/ip/ip6_punt_drop.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/ip6_reassembly.c \ vnet/ip/ip_api.c \ vnet/ip/ip_checksum.c \ vnet/ip/ip_frag.c \ - vnet/ip/ip.h \ + vnet/ip/ip.c \ 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/punt_api.c \ + vnet/ip/punt.c nobase_include_HEADERS += \ vnet/ip/format.h \ @@ -341,13 +387,12 @@ nobase_include_HEADERS += \ 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_error.def \ - vnet/ip/udp.h \ - vnet/ip/udp_packet.h + vnet/ip/punt.api.h \ + vnet/ip/punt.h -API_FILES += vnet/ip/ip.api +API_FILES += \ + vnet/ip/ip.api \ + vnet/ip/punt.api ######################################## # Bidirectional Forwarding Detection @@ -365,6 +410,7 @@ libvnet_la_SOURCES += \ vnet/bfd/bfd_udp.c \ vnet/bfd/bfd_main.c \ vnet/bfd/bfd_protocol.c \ + vnet/bfd/bfd_cli.c \ vnet/bfd/bfd_api.c API_FILES += vnet/bfd/bfd.api @@ -372,7 +418,7 @@ API_FILES += vnet/bfd/bfd.api ######################################## # Layer 3 protocol: IPSec ######################################## -if WITH_IPSEC +if WITH_LIBSSL libvnet_la_SOURCES += \ vnet/ipsec/ipsec.c \ vnet/ipsec/ipsec_cli.c \ @@ -381,8 +427,11 @@ libvnet_la_SOURCES += \ vnet/ipsec/ipsec_if.c \ vnet/ipsec/ipsec_if_in.c \ vnet/ipsec/ipsec_if_out.c \ + vnet/ipsec/esp_format.c \ vnet/ipsec/esp_encrypt.c \ vnet/ipsec/esp_decrypt.c \ + vnet/ipsec/ah_decrypt.c \ + vnet/ipsec/ah_encrypt.c \ vnet/ipsec/ikev2.c \ vnet/ipsec/ikev2_crypto.c \ vnet/ipsec/ikev2_cli.c \ @@ -391,15 +440,6 @@ libvnet_la_SOURCES += \ vnet/ipsec/ipsec_api.c API_FILES += vnet/ipsec/ipsec.api - -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 += \ @@ -408,14 +448,10 @@ libvnet_la_SOURCES += \ nobase_include_HEADERS += \ vnet/ipsec/ipsec.h \ vnet/ipsec/esp.h \ + vnet/ipsec/ah.h \ vnet/ipsec/ikev2.h \ vnet/ipsec/ikev2_priv.h \ vnet/ipsec/ipsec.api.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 @@ -454,12 +490,70 @@ test_map_SOURCES = \ test_map_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG test_map_LDADD = libvnet.la libvppinfra.la libvlib.la \ - -lpthread -lvlibmemory -lvlibapi \ - -ldl -lsvm -lrt + -lpthread -lvlibmemory -ldl -lsvm -lrt test_map_LDFLAGS = -static endif +######################################## +# Layer 4 protocol: tcp +######################################## +libvnet_la_SOURCES += \ + vnet/tcp/tcp_api.c \ + vnet/tcp/tcp_format.c \ + vnet/tcp/tcp_pg.c \ + vnet/tcp/tcp_syn_filter4.c \ + vnet/tcp/tcp_output.c \ + vnet/tcp/tcp_input.c \ + vnet/tcp/tcp_newreno.c \ + vnet/tcp/tcp_test.c \ + vnet/tcp/tcp.c + +nobase_include_HEADERS += \ + vnet/tcp/tcp_packet.h \ + vnet/tcp/tcp_timer.h \ + vnet/tcp/tcp_debug.h \ + vnet/tcp/tcp.h \ + vnet/tcp/tcp.api.h + +API_FILES += vnet/tcp/tcp.api + +######################################## +# Layer 4 protocol: udp +######################################## +libvnet_la_SOURCES += \ + vnet/udp/udp.c \ + vnet/udp/udp_input.c \ + vnet/udp/udp_format.c \ + vnet/udp/udp_local.c \ + vnet/udp/udp_pg.c \ + vnet/udp/udp_encap_node.c \ + vnet/udp/udp_encap.c \ + vnet/udp/udp_api.c + +nobase_include_HEADERS += \ + vnet/udp/udp_error.def \ + vnet/udp/udp.h \ + vnet/udp/udp_packet.h \ + vnet/udp/udp.api.h + +API_FILES += vnet/udp/udp.api + +######################################## +# Layer 4 protocol: sctp +######################################## +libvnet_la_SOURCES += \ + vnet/sctp/sctp.c \ + vnet/sctp/sctp_pg.c \ + vnet/sctp/sctp_input.c \ + vnet/sctp/sctp_output.c \ + vnet/sctp/sctp_format.c + +nobase_include_HEADERS += \ + vnet/sctp/sctp_error.def \ + vnet/sctp/sctp_packet.h \ + vnet/sctp/sctp_timer.h \ + vnet/sctp/sctp.h ######################################## # Tunnel protocol: gre @@ -504,7 +598,7 @@ libvnet_la_SOURCES += \ vnet/mpls/mpls_lookup.c \ vnet/mpls/mpls_output.c \ vnet/mpls/mpls_features.c \ - vnet/mpls/node.c \ + vnet/mpls/mpls_input.c \ vnet/mpls/interface.c \ vnet/mpls/mpls_tunnel.c \ vnet/mpls/pg.c \ @@ -565,6 +659,9 @@ libvnet_la_SOURCES += \ vnet/lisp-cp/gid_dictionary.c \ vnet/lisp-cp/lisp_msg_serdes.c \ vnet/lisp-cp/packets.c \ + vnet/lisp-cp/one_cli.c \ + vnet/lisp-cp/lisp_cli.c \ + vnet/lisp-cp/one_api.c \ vnet/lisp-cp/lisp_api.c nobase_include_HEADERS += \ @@ -574,9 +671,11 @@ nobase_include_HEADERS += \ vnet/lisp-cp/lisp_cp_messages.h \ vnet/lisp-cp/lisp_msg_serdes.h \ vnet/lisp-cp/control.h \ + vnet/lisp-cp/one.api.h \ vnet/lisp-cp/lisp.api.h API_FILES += vnet/lisp-cp/lisp.api +API_FILES += vnet/lisp-cp/one.api if ENABLE_TESTS LDS = \ @@ -585,7 +684,6 @@ LDS = \ libvlib.la \ libsvm.la \ libsvmdb.la \ - libvlibapi.la \ libvlibmemory.la \ -lpthread -ldl -lrt -lm @@ -634,81 +732,83 @@ nobase_include_HEADERS += \ API_FILES += vnet/lisp-gpe/lisp_gpe.api -if ENABLE_TESTS -TESTS += test_test - -test_test_SOURCES = tests/vnet/lisp-gpe/test.c - -test_test_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG - -test_test_LDADD = $(LIBOBJS) - -noinst_PROGRAMS += $(TESTS) -check_PROGRAMS += $(TESTS) -endif - ######################################## # DHCP client ######################################## libvnet_la_SOURCES += \ vnet/dhcp/client.c \ - vnet/dhcp/client.h + vnet/dhcp/dhcp_client_detect.c \ + vnet/dhcp/dhcp_api.c nobase_include_HEADERS += \ - vnet/dhcp/client.h + vnet/dhcp/client.h \ + vnet/dhcp/dhcp.api.h + +API_FILES += vnet/dhcp/dhcp.api ######################################## # DHCP proxy ######################################## libvnet_la_SOURCES += \ - vnet/dhcp/proxy_node.c \ - vnet/dhcp/proxy.h + vnet/dhcp/dhcp6_proxy_node.c \ + vnet/dhcp/dhcp4_proxy_node.c \ + vnet/dhcp/dhcp_proxy.c nobase_include_HEADERS += \ - vnet/dhcp/packet.h \ - vnet/dhcp/proxy.h \ - vnet/dhcp/proxy_error.def + vnet/dhcp/dhcp4_packet.h \ + vnet/dhcp/dhcp6_packet.h \ + vnet/dhcp/dhcp_proxy.h \ + vnet/dhcp/dhcp6_proxy_error.def \ + vnet/dhcp/dhcp4_proxy_error.def ######################################## # ipv6 segment routing ######################################## -if WITH_IPV6SR libvnet_la_SOURCES += \ - vnet/sr/sr.c \ - vnet/sr/sr_replicate.c \ - vnet/sr/sr_api.c -endif + vnet/srv6/sr.c \ + vnet/srv6/sr_localsid.c \ + vnet/srv6/sr_policy_rewrite.c \ + vnet/srv6/sr_steering.c \ + vnet/srv6/sr_api.c nobase_include_HEADERS += \ - vnet/sr/sr_packet.h \ - vnet/sr/sr_error.def \ - vnet/sr/sr.h \ - vnet/sr/sr.api.h + vnet/srv6/sr_packet.h \ + vnet/srv6/sr.h \ + vnet/srv6/sr.api.h -API_FILES += vnet/sr/sr.api +API_FILES += vnet/srv6/sr.api ######################################## -# DHCPv6 proxy +# mpls segment routing ######################################## + libvnet_la_SOURCES += \ - vnet/dhcpv6/proxy_node.c + vnet/srmpls/sr_mpls_policy.c \ + vnet/srmpls/sr_mpls_steering.c \ + vnet/srmpls/sr_mpls_api.c + nobase_include_HEADERS += \ - vnet/dhcpv6/packet.h \ - vnet/dhcpv6/proxy.h \ - vnet/dhcpv6/proxy_error.def + vnet/srmpls/sr_mpls.h \ + vnet/srmpls/sr_mpls.api.h + +API_FILES += vnet/srmpls/sr_mpls.api ######################################## # IPFIX / netflow v10 ######################################## libvnet_la_SOURCES += \ - vnet/flow/flow_report.c + vnet/flow/flow_report.c \ + vnet/flow/flow_api.c nobase_include_HEADERS += \ vnet/flow/flow_report.h \ vnet/flow/ipfix_info_elements.h \ - vnet/flow/ipfix_packet.h + vnet/flow/ipfix_packet.h \ + vnet/flow/flow.api.h + +API_FILES += vnet/flow/flow.api ######################################## # IPFIX classify code @@ -746,6 +846,23 @@ nobase_include_HEADERS += \ API_FILES += vnet/span/span.api +######################################## +# DNS proxy, API +######################################## +libvnet_la_SOURCES += \ + vnet/dns/dns.c \ + vnet/dns/dns.h \ + vnet/dns/dns_packet.h \ + vnet/dns/reply_node.c \ + vnet/dns/request_node.c \ + vnet/dns/resolver_process.c + +nobase_include_HEADERS += \ + vnet/dns/dns.api.h \ + vnet/dns/dns.h + +API_FILES += vnet/dns/dns.api + ######################################## # Packet generator ######################################## @@ -756,64 +873,103 @@ libvnet_la_SOURCES += \ vnet/pg/init.c \ vnet/pg/input.c \ vnet/pg/output.c \ - vnet/pg/stream.c + vnet/pg/stream.c \ + vnet/pg/pg_api.c nobase_include_HEADERS += \ vnet/pg/pg.h \ - vnet/pg/edit.h + vnet/pg/edit.h \ + vnet/pg/pg.api.h + +API_FILES += vnet/pg/pg.api ######################################## -# DPDK +# virtio ######################################## -if WITH_DPDK + libvnet_la_SOURCES += \ - vnet/devices/dpdk/buffer.c \ - vnet/devices/dpdk/dpdk_priv.h \ - vnet/devices/dpdk/device.c \ - vnet/devices/dpdk/format.c \ - vnet/devices/dpdk/init.c \ - vnet/devices/dpdk/node.c \ - vnet/devices/dpdk/thread.c \ - vnet/devices/dpdk/hqos.c \ - vnet/devices/dpdk/cli.c \ - vnet/devices/dpdk/dpdk_api.c + vnet/devices/virtio/device.c \ + vnet/devices/virtio/node.c \ + vnet/devices/virtio/vhost-user.c \ + vnet/devices/virtio/vhost_user_api.c \ + vnet/devices/virtio/virtio.c + nobase_include_HEADERS += \ - vnet/devices/dpdk/dpdk.h \ - vnet/devices/dpdk/dpdk.api.h + vnet/devices/virtio/virtio.h \ + vnet/devices/virtio/vhost-user.h \ + vnet/devices/virtio/vhost_user.api.h -API_FILES += vnet/devices/dpdk/dpdk.api -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 +API_FILES += vnet/devices/virtio/vhost_user.api ######################################## -# virtio +# tap interface (with virtio backend) ######################################## -libvnet_la_SOURCES += \ - vnet/devices/virtio/vhost-user.c \ - vnet/devices/virtio/vhost_user_api.c +libvnet_la_SOURCES += \ + vnet/devices/tap/cli.c \ + vnet/devices/tap/tap.c \ + vnet/devices/tap/tapv2_api.c -nobase_include_HEADERS += \ - vnet/devices/virtio/vhost-user.h \ - vnet/devices/virtio/vhost_user.api.h +nobase_include_HEADERS += \ + vnet/devices/tap/tap.h \ + vnet/devices/tap/tapv2.api.h -API_FILES += vnet/devices/virtio/vhost_user.api +API_FILES += vnet/devices/tap/tapv2.api ######################################## -# ssvm ethernet +# session managmeent +######################################## + +libvnet_la_SOURCES += \ + vnet/session/session.c \ + vnet/session/session_table.c \ + vnet/session/session_rules_table.c \ + vnet/session/session_lookup.c \ + vnet/session/session_node.c \ + vnet/session/transport.c \ + vnet/session/application.c \ + vnet/session/session_cli.c \ + vnet/session/application_interface.c \ + vnet/session/application_namespace.c \ + vnet/session/segment_manager.c \ + vnet/session/session_test.c \ + vnet/session/session_api.c + +nobase_include_HEADERS += \ + vnet/session/session.h \ + vnet/session/session_table.h \ + vnet/session/session_rules_table.h \ + vnet/session/stream_session.h \ + vnet/session/session_lookup.h \ + vnet/session/application.h \ + vnet/session/transport.h \ + vnet/session/transport_interface.h \ + vnet/session/application_interface.h \ + vnet/session/application_namespace.h \ + vnet/session/session_debug.h \ + vnet/session/segment_manager.h \ + vnet/session/mma_template.h \ + vnet/session/mma_template.c \ + vnet/session/mma_16.h \ + vnet/session/mma_40.h \ + vnet/session/session.api.h + +API_FILES += vnet/session/session.api + +######################################## +# session layer applications ######################################## + libvnet_la_SOURCES += \ - vnet/devices/ssvm/ssvm_eth.c \ - vnet/devices/ssvm/node.c + vnet/session-apps/echo_client.c \ + vnet/session-apps/echo_server.c \ + vnet/session-apps/http_server.c \ + vnet/session-apps/proxy.c nobase_include_HEADERS += \ - vnet/devices/ssvm/ssvm_eth.h + vnet/session-apps/echo_client.h \ + vnet/session-apps/proxy.h ######################################## # Linux packet interface @@ -855,10 +1011,14 @@ API_FILES += vnet/devices/netmap/netmap.api libvnet_la_SOURCES += \ vnet/feature/feature.c \ + vnet/feature/feature_api.c \ vnet/feature/registration.c nobase_include_HEADERS += \ - vnet/feature/feature.h + vnet/feature/feature.h \ + vnet/feature/feature.api.h + +API_FILES += vnet/feature/feature.api ######################################## # Unix kernel related @@ -912,7 +1072,8 @@ libvnet_la_SOURCES += \ vnet/fib/fib_path.c \ vnet/fib/fib_path_ext.c \ vnet/fib/fib_urpf_list.c \ - vnet/fib/fib_attached_export.c + vnet/fib/fib_attached_export.c \ + vnet/fib/fib_bfd.c nobase_include_HEADERS += \ vnet/fib/fib.h \ @@ -932,18 +1093,23 @@ nobase_include_HEADERS += \ libvnet_la_SOURCES += \ vnet/adj/adj_nbr.c \ - vnet/adj/adj_rewrite.c \ vnet/adj/adj_glean.c \ vnet/adj/adj_midchain.c \ + vnet/adj/adj_mcast.c \ vnet/adj/adj_l2.c \ - vnet/adj/adj.c + vnet/adj/adj_nsh.c \ + vnet/adj/adj.c \ + vnet/adj/rewrite.c \ + vnet/adj/adj_bfd.c \ + vnet/adj/adj_delegate.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 + vnet/adj/adj_nsh.h \ + vnet/adj/adj_nbr.h \ + vnet/adj/rewrite.h ######################################## # Data-Plane Objects @@ -957,9 +1123,15 @@ libvnet_la_SOURCES += \ 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 + vnet/dpo/lookup_dpo.c \ + vnet/dpo/classify_dpo.c \ + vnet/dpo/replicate_dpo.c \ + vnet/dpo/interface_rx_dpo.c \ + vnet/dpo/interface_tx_dpo.c \ + vnet/dpo/mpls_disposition.c \ + vnet/dpo/mpls_label_dpo.c \ + vnet/dpo/l3_proxy_dpo.c \ + vnet/dpo/dvr_dpo.c nobase_include_HEADERS += \ vnet/dpo/load_balance.h \ @@ -969,8 +1141,88 @@ nobase_include_HEADERS += \ vnet/dpo/classify_dpo.h \ vnet/dpo/receive_dpo.h \ vnet/dpo/ip_null_dpo.h \ + vnet/dpo/replicate_dpo.h \ vnet/dpo/dpo.h +######################################## +# Multicast FIB +######################################## + +libvnet_la_SOURCES += \ + vnet/mfib/mfib_test.c \ + vnet/mfib/mfib_forward.c \ + vnet/mfib/ip4_mfib.c \ + vnet/mfib/ip6_mfib.c \ + vnet/mfib/mfib_types.c \ + vnet/mfib/mfib_signal.c \ + vnet/mfib/mfib_itf.c \ + vnet/mfib/mfib_entry.c \ + vnet/mfib/mfib_table.c + +nobase_include_HEADERS += \ + vnet/mfib/ip4_mfib.h \ + vnet/mfib/mfib_types.h \ + vnet/mfib/mfib_table.h + +######################################## +# Utilities +######################################## + +libvnet_la_SOURCES += \ + vnet/util/radix.c \ + vnet/util/refcount.c \ + vnet/util/trajectory.c + +######################################## +# BIER +######################################## + +libvnet_la_SOURCES += \ + vnet/bier/bier_bit_string.c \ + vnet/bier/bier_entry.c \ + vnet/bier/bier_fmask.c \ + vnet/bier/bier_fmask_db.c \ + vnet/bier/bier_input.c \ + vnet/bier/bier_lookup.c \ + vnet/bier/bier_output.c \ + vnet/bier/bier_table.c \ + vnet/bier/bier_types.c \ + vnet/bier/bier_test.c \ + vnet/bier/bier_api.c \ + vnet/bier/bier_drop.c \ + vnet/bier/bier_update.c \ + vnet/bier/bier_imp_node.c \ + vnet/bier/bier_imp.c \ + vnet/bier/bier_disp_entry.c \ + vnet/bier/bier_disp_lookup_node.c \ + vnet/bier/bier_disp_dispatch_node.c \ + vnet/bier/bier_disp_table.c \ + vnet/bier/bier_bift_table.c + +nobase_include_HEADERS += \ + vnet/bier/bier_types.h \ + vnet/bier/bier_entry.h \ + vnet/bier/bier_update.h \ + vnet/bier/bier.api.h \ + vnet/bier/bier_table.h + +API_FILES += vnet/bier/bier.api + +######################################## +# Test apps +######################################## + +noinst_PROGRAMS += tcp_echo udp_echo + +TEST_APPS_LDADD = libvlibmemoryclient.la libsvm.la libvppinfra.la +TEST_APPS_LDADD += -lpthread -lm -lrt + +tcp_echo_SOURCES = tests/vnet/session/tcp_echo.c +tcp_echo_LDADD = $(TEST_APPS_LDADD) + +udp_echo_SOURCES = tests/vnet/session/udp_echo.c +udp_echo_LDADD = $(TEST_APPS_LDADD) + ######################################## # Plugin client library ########################################