X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=adf93398648f00778ca958225995d7f34bbc861a;hb=a9855ef839ab99d7e66b9dd8d706b14cc8cd77dd;hp=2bae8678c4b5fd7eb66436bb26ca9cfe3da694e2;hpb=f068c3ed296c49dfbfe17677fc1ad2428fb4e3e4;p=vpp.git diff --git a/src/vnet.am b/src/vnet.am index 2bae8678c4b..adf93398648 100644 --- a/src/vnet.am +++ b/src/vnet.am @@ -41,6 +41,7 @@ libvnet_la_SOURCES += \ vnet/interface_cli.c \ vnet/interface_format.c \ vnet/interface_output.c \ + vnet/interface_stats.c \ vnet/misc.c \ vnet/replication.c @@ -148,12 +149,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 \ @@ -274,15 +274,19 @@ nobase_include_HEADERS += \ API_FILES += vnet/geneve/geneve.api ######################################## -# Layer 2 / CDP +# Layer 2 / Bonding ######################################## libvnet_la_SOURCES += \ - vnet/cdp/cdp_input.c \ - vnet/cdp/cdp_node.c \ - vnet/cdp/cdp_periodic.c + vnet/bonding/cli.c \ + vnet/bonding/node.c \ + vnet/bonding/device.c \ + vnet/bonding/bond_api.c nobase_include_HEADERS += \ - vnet/cdp/cdp_protocol.h + vnet/bonding/node.h \ + vnet/bonding/bond.api.h + +API_FILES += vnet/bonding/bond.api ######################################## # Layer 2 / LLDP @@ -307,7 +311,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 +320,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,19 +347,24 @@ 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/rd_cp.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 \ @@ -368,6 +377,7 @@ nobase_include_HEADERS += \ vnet/ip/icmp6.h \ vnet/ip/igmp_packet.h \ vnet/ip/ip.api.h \ + vnet/ip/rd_cp.api.h \ vnet/ip/ip4_error.h \ vnet/ip/ip4.h \ vnet/ip/ip4_mtrie.h \ @@ -390,6 +400,7 @@ nobase_include_HEADERS += \ API_FILES += \ vnet/ip/ip.api \ + vnet/ip/rd_cp.api \ vnet/ip/punt.api ######################################## @@ -504,10 +515,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 +533,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 +548,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 ######################################## @@ -560,6 +586,22 @@ nobase_include_HEADERS += \ API_FILES += vnet/gre/gre.api +######################################## +# Tunnel protocol: ipip +######################################## +libvnet_la_SOURCES += \ + vnet/ipip/ipip.c \ + vnet/ipip/node.c \ + vnet/ipip/sixrd.c \ + vnet/ipip/ipip_api.c \ + vnet/ipip/ipip_cli.c + +nobase_include_HEADERS += \ + vnet/ipip/ipip.api.h \ + vnet/ipip/ipip.h + +API_FILES += vnet/ipip/ipip.api + ######################################## # Tunnel protocol: l2tpv3 ######################################## @@ -724,7 +766,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 += \ @@ -786,26 +828,26 @@ API_FILES += vnet/srmpls/sr_mpls.api # IPFIX / netflow v10 ######################################## libvnet_la_SOURCES += \ - vnet/flow/flow_report.c \ - vnet/flow/flow_api.c + vnet/ipfix-export/flow_report.c \ + vnet/ipfix-export/flow_api.c nobase_include_HEADERS += \ - vnet/flow/flow_report.h \ - vnet/flow/ipfix_info_elements.h \ - vnet/flow/ipfix_packet.h \ - vnet/flow/flow.api.h + vnet/ipfix-export/flow_report.h \ + vnet/ipfix-export/ipfix_info_elements.h \ + vnet/ipfix-export/ipfix_packet.h \ + vnet/ipfix-export/ipfix_export.api.h -API_FILES += vnet/flow/flow.api +API_FILES += vnet/ipfix-export/ipfix_export.api ######################################## # IPFIX classify code ######################################## libvnet_la_SOURCES += \ - vnet/flow/flow_report_classify.c + vnet/ipfix-export/flow_report_classify.c nobase_include_HEADERS += \ - vnet/flow/flow_report_classify.h + vnet/ipfix-export/flow_report_classify.h ######################################## # lawful intercept @@ -904,16 +946,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 ######################################## @@ -954,6 +986,29 @@ 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 + +nobase_include_HEADERS += \ + vnet/session-apps/echo_client.h \ + vnet/session-apps/proxy.h + +######################################## +# TLS protocol +######################################## + +libvnet_la_SOURCES += vnet/tls/tls.c + +nobase_include_HEADERS += \ + vnet/tls/tls.h + ######################################## # Linux packet interface ######################################## @@ -1043,6 +1098,7 @@ libvnet_la_SOURCES += \ vnet/fib/fib_entry_src.c \ vnet/fib/fib_entry_src_rr.c \ vnet/fib/fib_entry_src_interface.c \ + vnet/fib/fib_entry_src_interpose.c \ vnet/fib/fib_entry_src_default_route.c \ vnet/fib/fib_entry_src_special.c \ vnet/fib/fib_entry_src_api.c \ @@ -1056,6 +1112,7 @@ libvnet_la_SOURCES += \ vnet/fib/fib_path_ext.c \ vnet/fib/fib_urpf_list.c \ vnet/fib/fib_attached_export.c \ + vnet/fib/fib_api.c \ vnet/fib/fib_bfd.c nobase_include_HEADERS += \ @@ -1102,6 +1159,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 \ @@ -1156,6 +1214,22 @@ libvnet_la_SOURCES += \ vnet/util/refcount.c \ vnet/util/trajectory.c +######################################## +# QoS +######################################## + +libvnet_la_SOURCES += \ + vnet/qos/qos_types.c \ + vnet/qos/qos_api.c \ + vnet/qos/qos_egress_map.c \ + vnet/qos/qos_record.c \ + vnet/qos/qos_mark.c + +API_FILES += vnet/qos/qos.api + +nobase_include_HEADERS += \ + vnet/qos/qos.api.h + ######################################## # BIER ######################################## @@ -1220,6 +1294,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