X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=f95ec2fb5afd408f64085772f1c471243633c1ac;hb=fa5d19829759cef45cc34efe844d9471f5a1fc61;hp=6d043e32273dc3321aa7cc0726423e05e1e59e29;hpb=32e1c010b0c34fd0984f7fc45fae648a182025c5;p=vpp.git diff --git a/src/vnet.am b/src/vnet.am index 6d043e32273..f95ec2fb5af 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 \ @@ -62,7 +58,8 @@ nobase_include_HEADERS += \ 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 API_FILES += vnet/interface.api @@ -73,12 +70,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 +89,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 +111,16 @@ 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 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 ######################################## # Layer 2 protocol: Ethernet bridging @@ -315,11 +322,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 \ @@ -345,11 +348,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 @@ -369,6 +368,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 @@ -395,15 +395,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 += \ @@ -415,11 +406,6 @@ nobase_include_HEADERS += \ 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 @@ -458,12 +444,47 @@ 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_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/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 + +######################################## +# 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 @@ -508,7 +529,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 \ @@ -569,7 +590,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 += \ @@ -579,9 +602,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 = \ @@ -590,7 +615,6 @@ LDS = \ libvlib.la \ libsvm.la \ libsvmdb.la \ - libvlibapi.la \ libvlibmemory.la \ -lpthread -ldl -lrt -lm @@ -661,7 +685,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 @@ -670,13 +694,16 @@ 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 @@ -684,30 +711,20 @@ nobase_include_HEADERS += \ if WITH_LIBSSL libvnet_la_SOURCES += \ - vnet/sr/sr.c \ - vnet/sr/sr_replicate.c \ + 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 nobase_include_HEADERS += \ vnet/sr/sr_packet.h \ - vnet/sr/sr_error.def \ vnet/sr/sr.h \ vnet/sr/sr.api.h API_FILES += vnet/sr/sr.api -######################################## -# DHCPv6 proxy -######################################## -libvnet_la_SOURCES += \ - vnet/dhcpv6/proxy_node.c - -nobase_include_HEADERS += \ - vnet/dhcpv6/packet.h \ - vnet/dhcpv6/proxy.h \ - vnet/dhcpv6/proxy_error.def - ######################################## # IPFIX / netflow v10 ######################################## @@ -775,36 +792,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 ######################################## @@ -829,6 +816,30 @@ libvnet_la_SOURCES += \ nobase_include_HEADERS += \ vnet/devices/ssvm/ssvm_eth.h +######################################## +# session managmeent +######################################## + +libvnet_la_SOURCES += \ + vnet/session/session.c \ + vnet/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/session_api.c + +nobase_include_HEADERS += \ + vnet/session/session.h \ + vnet/session/application.h \ + vnet/session/transport.h \ + vnet/session/application_interface.h \ + vnet/session/session_debug.h \ + vnet/session/session.api.h + +API_FILES += vnet/session/session.api + ######################################## # Linux packet interface ######################################## @@ -950,13 +961,17 @@ libvnet_la_SOURCES += \ 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 nobase_include_HEADERS += \ vnet/adj/adj.h \ vnet/adj/adj_types.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