X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=e1e69b1827c7459d6c66af4a5377e16b531078c2;hb=e4e34c23fe7050c26967997fdb8f555c51fd3961;hp=72e67dcb298695e944727e43ddab77336d85f4cd;hpb=430ac939d115b59e3f7f704645c6f88878223e1b;p=vpp.git diff --git a/src/vnet.am b/src/vnet.am index 72e67dcb298..e1e69b1827c 100644 --- a/src/vnet.am +++ b/src/vnet.am @@ -27,6 +27,10 @@ if WITH_LIBSSL libvnet_la_LIBADD += -lcrypto endif +if WITH_MBEDTLS +libvnet_la_LIBADD += -lmbedtls -lmbedx509 -lmbedcrypto +endif + ######################################## # Generic stuff ######################################## @@ -34,6 +38,7 @@ 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 \ @@ -48,6 +53,7 @@ nobase_include_HEADERS += \ vnet/buffer.h \ vnet/config.h \ vnet/devices/devices.h \ + vnet/devices/netlink.h \ vnet/global_funcs.h \ vnet/handoff.h \ vnet/interface.h \ @@ -61,7 +67,8 @@ nobase_include_HEADERS += \ vnet/vnet.h \ vnet/vnet_all_api_h.h \ vnet/vnet_msg_enum.h \ - vnet/util/radix.h + vnet/util/radix.h \ + vnet/util/refcount.h API_FILES += vnet/interface.api @@ -145,12 +152,11 @@ libvnet_la_SOURCES += \ vnet/l2/l2_fib.c \ vnet/l2/l2_flood.c \ vnet/l2/l2_fwd.c \ - vnet/l2/l2_input_acl.c \ vnet/l2/l2_input.c \ vnet/l2/l2_input_vtr.c \ vnet/l2/l2_learn.c \ - vnet/l2/l2_output_acl.c \ vnet/l2/l2_output.c \ + vnet/l2/l2_in_out_acl.c \ vnet/l2/l2_patch.c \ vnet/l2/l2_rw.c \ vnet/l2/l2_vtr.c \ @@ -304,7 +310,7 @@ API_FILES += vnet/lldp/lldp.api libvnet_la_SOURCES += \ vnet/classify/vnet_classify.c \ vnet/classify/ip_classify.c \ - vnet/classify/input_acl.c \ + vnet/classify/in_out_acl.c \ vnet/classify/policer_classify.c \ vnet/classify/flow_classify.c \ vnet/classify/flow_classify_node.c \ @@ -313,7 +319,7 @@ libvnet_la_SOURCES += \ nobase_include_HEADERS += \ vnet/classify/vnet_classify.h \ - vnet/classify/input_acl.h \ + vnet/classify/in_out_acl.h \ vnet/classify/policer_classify.h \ vnet/classify/flow_classify.h \ vnet/classify/classify.api.h @@ -340,19 +346,23 @@ libvnet_la_SOURCES += \ 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_ll_table.c \ + vnet/ip/ip6_ll_types.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.c \ vnet/ip/ip_init.c \ - vnet/ip/ip_input_acl.c \ + vnet/ip/ip_in_out_acl.c \ vnet/ip/lookup.c \ vnet/ip/ping.c \ vnet/ip/punt_api.c \ @@ -501,10 +511,6 @@ libvnet_la_SOURCES += \ 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 @@ -523,7 +529,6 @@ API_FILES += vnet/tcp/tcp.api 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 \ @@ -539,6 +544,26 @@ nobase_include_HEADERS += \ API_FILES += vnet/udp/udp.api +######################################## +# Layer 4 protocol: sctp +######################################## +libvnet_la_SOURCES += \ + vnet/sctp/sctp_api.c \ + 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 \ + vnet/sctp/sctp.api.h + +API_FILES += vnet/sctp/sctp.api + ######################################## # Tunnel protocol: gre ######################################## @@ -721,7 +746,7 @@ API_FILES += vnet/lisp-gpe/lisp_gpe.api ######################################## 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 += \ @@ -769,11 +794,15 @@ API_FILES += vnet/srv6/sr.api libvnet_la_SOURCES += \ vnet/srmpls/sr_mpls_policy.c \ - vnet/srmpls/sr_mpls_steering.c + vnet/srmpls/sr_mpls_steering.c \ + vnet/srmpls/sr_mpls_api.c nobase_include_HEADERS += \ - vnet/srmpls/sr.h + vnet/srmpls/sr_mpls.h \ + vnet/srmpls/sr_mpls.api.h + +API_FILES += vnet/srmpls/sr_mpls.api ######################################## # IPFIX / netflow v10 @@ -867,25 +896,35 @@ API_FILES += vnet/pg/pg.api # virtio ######################################## -libvnet_la_SOURCES += \ - vnet/devices/virtio/vhost-user.c \ - vnet/devices/virtio/vhost_user_api.c +libvnet_la_SOURCES += \ + 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/virtio/vhost-user.h \ +nobase_include_HEADERS += \ + vnet/devices/virtio/virtio.h \ + vnet/devices/virtio/vhost-user.h \ vnet/devices/virtio/vhost_user.api.h API_FILES += vnet/devices/virtio/vhost_user.api ######################################## -# ssvm ethernet +# tap interface (with virtio backend) ######################################## -libvnet_la_SOURCES += \ - vnet/devices/ssvm/ssvm_eth.c \ - vnet/devices/ssvm/node.c -nobase_include_HEADERS += \ - vnet/devices/ssvm/ssvm_eth.h +libvnet_la_SOURCES += \ + vnet/devices/tap/cli.c \ + vnet/devices/tap/tap.c \ + vnet/devices/tap/tapv2_api.c + +nobase_include_HEADERS += \ + vnet/devices/tap/tap.h \ + vnet/devices/tap/tapv2.api.h + +API_FILES += vnet/devices/tap/tapv2.api ######################################## # session managmeent @@ -927,6 +966,24 @@ nobase_include_HEADERS += \ API_FILES += vnet/session/session.api +######################################## +# session layer applications +######################################## + +libvnet_la_SOURCES += \ + vnet/session-apps/echo_client.c \ + vnet/session-apps/echo_server.c \ + vnet/session-apps/http_server.c \ + vnet/session-apps/proxy.c + +if WITH_MBEDTLS +libvnet_la_SOURCES += vnet/session-apps/tls.c +endif + +nobase_include_HEADERS += \ + vnet/session-apps/echo_client.h \ + vnet/session-apps/proxy.h + ######################################## # Linux packet interface ######################################## @@ -1075,6 +1132,7 @@ libvnet_la_SOURCES += \ vnet/dpo/dpo.c \ vnet/dpo/drop_dpo.c \ vnet/dpo/ip_null_dpo.c \ + vnet/dpo/ip6_ll_dpo.c \ vnet/dpo/punt_dpo.c \ vnet/dpo/receive_dpo.c \ vnet/dpo/load_balance.c \ @@ -1087,7 +1145,7 @@ libvnet_la_SOURCES += \ vnet/dpo/mpls_disposition.c \ vnet/dpo/mpls_label_dpo.c \ vnet/dpo/l3_proxy_dpo.c \ - vnet/dpo/l2_bridge_dpo.c + vnet/dpo/dvr_dpo.c nobase_include_HEADERS += \ vnet/dpo/load_balance.h \ @@ -1125,7 +1183,8 @@ nobase_include_HEADERS += \ ######################################## libvnet_la_SOURCES += \ - vnet/util/radix.c \ + vnet/util/radix.c \ + vnet/util/refcount.c \ vnet/util/trajectory.c ######################################## @@ -1151,7 +1210,8 @@ libvnet_la_SOURCES += \ 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_disp_table.c \ + vnet/bier/bier_bift_table.c nobase_include_HEADERS += \ vnet/bier/bier_types.h \ @@ -1162,6 +1222,21 @@ nobase_include_HEADERS += \ 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 ######################################## @@ -1176,6 +1251,13 @@ pcap2pg_SOURCES = \ pcap2pg_LDFLAGS = -static pcap2pg_LDADD = libvnet.la libvppinfra.la -lpthread libvlibmemory.la -lm -ldl -noinst_PROGRAMS += pcap2pg +pcap2cinit_SOURCES = \ + vnet/unix/pcap2cinit.c \ + vnet/unix/pcap.h + +pcap2cinit_LDFLAGS = -static +pcap2cinit_LDADD = libvnet.la libvppinfra.la -lpthread libvlibmemory.la -lm -ldl + +noinst_PROGRAMS += pcap2pg pcap2cinit # vi:syntax=automake