X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=f5e44783345652a76e436b3d33fef1a519f80abd;hb=b8d4481a93f919291d4b682ef0ac8948a9f1be32;hp=bed4902ba0a407dfad93b9455c9b26b736413a0d;hpb=0f26c5a0138ac86d7ebd197c31a09d8d624c35fe;p=vpp.git diff --git a/src/vnet.am b/src/vnet.am index bed4902ba0a..f5e44783345 100644 --- a/src/vnet.am +++ b/src/vnet.am @@ -52,6 +52,8 @@ nobase_include_HEADERS += \ 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 \ @@ -111,7 +113,10 @@ libvnet_la_SOURCES += \ vnet/ethernet/interface.c \ vnet/ethernet/node.c \ vnet/ethernet/pg.c \ - vnet/ethernet/sfp.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 \ @@ -119,7 +124,11 @@ nobase_include_HEADERS += \ vnet/ethernet/ethernet.h \ vnet/ethernet/packet.h \ vnet/ethernet/types.def \ - vnet/ethernet/sfp.h + 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 @@ -243,6 +252,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 ######################################## @@ -261,10 +287,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" @@ -302,6 +333,7 @@ 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 \ @@ -309,6 +341,7 @@ libvnet_la_SOURCES += \ vnet/ip/ip4_source_check.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 \ @@ -316,11 +349,12 @@ libvnet_la_SOURCES += \ 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_api.c \ vnet/ip/punt.c nobase_include_HEADERS += \ @@ -347,9 +381,12 @@ nobase_include_HEADERS += \ vnet/ip/ports.def \ vnet/ip/protocols.def \ vnet/ip/punt_error.def \ + 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 @@ -384,6 +421,7 @@ 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/ikev2.c \ @@ -452,6 +490,7 @@ 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 \ @@ -460,6 +499,8 @@ libvnet_la_SOURCES += \ vnet/tcp/tcp_newreno.c \ vnet/tcp/builtin_client.c \ vnet/tcp/builtin_server.c \ + vnet/tcp/builtin_http_server.c \ + vnet/tcp/builtin_proxy.c \ vnet/tcp/tcp_test.c \ vnet/tcp/tcp.c @@ -467,7 +508,10 @@ 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.h \ + vnet/tcp/tcp.api.h + +API_FILES += vnet/tcp/tcp.api ######################################## # Layer 4 protocol: udp @@ -478,12 +522,18 @@ libvnet_la_SOURCES += \ vnet/udp/builtin_server.c \ vnet/udp/udp_format.c \ vnet/udp/udp_local.c \ - vnet/udp/udp_pg.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_packet.h \ + vnet/udp/udp.api.h + +API_FILES += vnet/udp/udp.api ######################################## # Tunnel protocol: gre @@ -662,19 +712,6 @@ 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 ######################################## @@ -708,21 +745,31 @@ nobase_include_HEADERS += \ # ipv6 segment routing ######################################## -if WITH_LIBSSL libvnet_la_SOURCES += \ - vnet/sr/sr.c \ - vnet/sr/sr_localsid.c \ - vnet/sr/sr_policy_rewrite.c \ - vnet/sr/sr_steering.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.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 + +######################################## +# mpls segment routing +######################################## + +libvnet_la_SOURCES += \ + vnet/srmpls/sr_mpls_policy.c \ + vnet/srmpls/sr_mpls_steering.c + + +nobase_include_HEADERS += \ + vnet/srmpls/sr.h ######################################## # IPFIX / netflow v10 @@ -775,6 +822,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 ######################################## @@ -785,11 +849,15 @@ 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 ######################################## # virtio @@ -821,20 +889,36 @@ nobase_include_HEADERS += \ libvnet_la_SOURCES += \ vnet/session/session.c \ - vnet/session/node.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/hashes.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 @@ -879,10 +963,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 @@ -990,9 +1078,12 @@ libvnet_la_SOURCES += \ vnet/dpo/lookup_dpo.c \ vnet/dpo/classify_dpo.c \ vnet/dpo/replicate_dpo.c \ - vnet/dpo/interface_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/mpls_label_dpo.c \ + vnet/dpo/l3_proxy_dpo.c \ + vnet/dpo/l2_bridge_dpo.c nobase_include_HEADERS += \ vnet/dpo/load_balance.h \ @@ -1002,6 +1093,7 @@ 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 ######################################## @@ -1029,7 +1121,42 @@ nobase_include_HEADERS += \ ######################################## libvnet_la_SOURCES += \ - vnet/util/radix.c + vnet/util/radix.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 + +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 ######################################## # Plugin client library