X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=c787eb377033ba77e697c140d5afc2129235a3b1;hb=371ca50a74a9c4f1b74c4c1b65c6fdec610fcfc3;hp=35a072f6d8a3d8abe34c53dd1c26ecb50c009bd5;hpb=891f0a1caa795ed7799f0c6faa1cb91b4669d4da;p=vpp.git diff --git a/src/vnet.am b/src/vnet.am index 35a072f6d8a..c787eb37703 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 ######################################## @@ -148,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 \ @@ -307,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 \ @@ -316,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 @@ -343,6 +346,7 @@ 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_punt_drop.c \ @@ -350,12 +354,13 @@ libvnet_la_SOURCES += \ 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 \ @@ -504,10 +509,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 @@ -526,7 +527,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 \ @@ -542,6 +542,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 ######################################## @@ -724,7 +744,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 += \ @@ -772,11 +792,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 @@ -900,16 +924,6 @@ nobase_include_HEADERS += \ API_FILES += vnet/devices/tap/tapv2.api -######################################## -# ssvm ethernet -######################################## -libvnet_la_SOURCES += \ - vnet/devices/ssvm/ssvm_eth.c \ - vnet/devices/ssvm/node.c - -nobase_include_HEADERS += \ - vnet/devices/ssvm/ssvm_eth.h - ######################################## # session managmeent ######################################## @@ -950,6 +964,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 ######################################## @@ -1110,7 +1142,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 \ @@ -1216,6 +1248,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