X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=ab0978074b6e7bd914bd7fe6a39744f15863b0ee;hb=d91c1dbdb31f80db7d967f2f57c43d0a81d65297;hp=dcab19da866f43f3126966453f3cb93ed7b84229;hpb=654ceaff759b89c00d242b7d494abaeeea356f32;p=vpp.git diff --git a/src/vnet.am b/src/vnet.am index dcab19da866..ab0978074b6 100644 --- a/src/vnet.am +++ b/src/vnet.am @@ -40,8 +40,7 @@ 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 \ @@ -53,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 \ @@ -112,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 \ @@ -120,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 @@ -244,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 ######################################## @@ -262,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" @@ -303,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 \ @@ -310,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 \ @@ -385,6 +417,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 \ @@ -453,6 +486,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 \ @@ -461,6 +495,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 @@ -468,7 +504,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 @@ -663,19 +702,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 ######################################## @@ -709,21 +735,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/srv6/sr.api -API_FILES += vnet/sr/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 @@ -822,20 +858,25 @@ nobase_include_HEADERS += \ libvnet_la_SOURCES += \ vnet/session/session.c \ - vnet/session/node.c \ - vnet/session/transport.c \ + vnet/session/session_lookup.c \ + vnet/session/session_node.c \ + vnet/session/transport_interface.c \ vnet/session/application.c \ vnet/session/session_cli.c \ - vnet/session/hashes.c \ vnet/session/application_interface.c \ + vnet/session/segment_manager.c \ vnet/session/session_api.c nobase_include_HEADERS += \ vnet/session/session.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/session_debug.h \ + vnet/session/segment_manager.h \ vnet/session/session.api.h API_FILES += vnet/session/session.api @@ -937,7 +978,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 \ @@ -962,14 +1004,18 @@ libvnet_la_SOURCES += \ vnet/adj/adj_mcast.c \ vnet/adj/adj_l2.c \ vnet/adj/adj_nsh.c \ - vnet/adj/adj.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_glean.h \ vnet/adj/adj_nsh.h \ - vnet/adj/adj_nbr.h + vnet/adj/adj_nbr.h \ + vnet/adj/rewrite.h ######################################## # Data-Plane Objects @@ -986,7 +1032,11 @@ libvnet_la_SOURCES += \ vnet/dpo/lookup_dpo.c \ vnet/dpo/classify_dpo.c \ vnet/dpo/replicate_dpo.c \ - vnet/dpo/mpls_label_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/l2_bridge_dpo.c nobase_include_HEADERS += \ vnet/dpo/load_balance.h \