X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=aa3ada1dadabacc875f51f3e46562d2c756fd084;hb=6f6311560380d0e992f710558e213df1b098ef94;hp=70f1e7e95bd0cbe4b2d876904226f46a52dbd512;hpb=694396dc589b4fe75b1fad02fde1d3c3cdaeef04;p=vpp.git diff --git a/src/vnet.am b/src/vnet.am index 70f1e7e95bd..aa3ada1dada 100644 --- a/src/vnet.am +++ b/src/vnet.am @@ -19,12 +19,9 @@ 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_LIBSSL libvnet_la_LIBADD += -lcrypto @@ -43,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 \ @@ -56,10 +52,11 @@ 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 \ - vnet/rewrite.h \ vnet/vnet.h \ vnet/vnet_all_api_h.h \ vnet/vnet_msg_enum.h \ @@ -115,14 +112,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 @@ -264,10 +270,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" @@ -324,11 +335,7 @@ libvnet_la_SOURCES += \ 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.c nobase_include_HEADERS += \ vnet/ip/format.h \ @@ -354,11 +361,7 @@ 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.h API_FILES += vnet/ip/ip.api @@ -378,6 +381,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 @@ -404,15 +408,6 @@ libvnet_la_SOURCES += \ vnet/ipsec/ipsec_api.c API_FILES += vnet/ipsec/ipsec.api - -if WITH_DPDK -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 += \ @@ -424,11 +419,6 @@ nobase_include_HEADERS += \ vnet/ipsec/ikev2.h \ vnet/ipsec/ikev2_priv.h \ vnet/ipsec/ipsec.api.h -if WITH_DPDK -nobase_include_HEADERS += \ - vnet/devices/dpdk/ipsec/ipsec.h \ - vnet/devices/dpdk/ipsec/esp.h -endif ######################################## # Layer 3 protocol: osi @@ -467,12 +457,53 @@ 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/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 + +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/builtin_server.c \ + vnet/udp/udp_format.c \ + vnet/udp/udp_local.c \ + vnet/udp/udp_pg.c + +nobase_include_HEADERS += \ + vnet/udp/udp_error.def \ + vnet/udp/udp.h \ + vnet/udp/udp_packet.h ######################################## # Tunnel protocol: gre @@ -517,7 +548,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 \ @@ -603,7 +634,6 @@ LDS = \ libvlib.la \ libsvm.la \ libsvmdb.la \ - libvlibapi.la \ libvlibmemory.la \ -lpthread -ldl -lrt -lm @@ -652,19 +682,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 ######################################## @@ -674,7 +691,7 @@ libvnet_la_SOURCES += \ 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 @@ -683,42 +700,46 @@ 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_LIBSSL libvnet_la_SOURCES += \ - vnet/sr/sr.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 + nobase_include_HEADERS += \ - vnet/dhcpv6/packet.h \ - vnet/dhcpv6/proxy.h \ - vnet/dhcpv6/proxy_error.def + vnet/srmpls/sr.h ######################################## # IPFIX / netflow v10 @@ -787,36 +808,6 @@ nobase_include_HEADERS += \ vnet/pg/pg.h \ vnet/pg/edit.h -######################################## -# DPDK -######################################## -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/main.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 - -nobase_include_HEADERS += \ - vnet/devices/dpdk/dpdk.h \ - vnet/devices/dpdk/dpdk.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 - ######################################## # virtio ######################################## @@ -841,6 +832,35 @@ libvnet_la_SOURCES += \ nobase_include_HEADERS += \ vnet/devices/ssvm/ssvm_eth.h +######################################## +# session managmeent +######################################## + +libvnet_la_SOURCES += \ + vnet/session/session.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/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 + ######################################## # Linux packet interface ######################################## @@ -938,7 +958,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 \ @@ -963,14 +984,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 @@ -987,7 +1012,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 \