X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=2a5a4b8328665cd9c65bdd3f2ec58a2cfb5842ea;hb=7895872981c6c5a146f76ce7a35ce7350b21f72f;hp=e1e69b1827c7459d6c66af4a5377e16b531078c2;hpb=53da221b13225695516ec7469ca29d82bb10e594;p=vpp.git diff --git a/src/vnet.am b/src/vnet.am index e1e69b1827c..2a5a4b83286 100644 --- a/src/vnet.am +++ b/src/vnet.am @@ -27,10 +27,6 @@ if WITH_LIBSSL libvnet_la_LIBADD += -lcrypto endif -if WITH_MBEDTLS -libvnet_la_LIBADD += -lmbedtls -lmbedx509 -lmbedcrypto -endif - ######################################## # Generic stuff ######################################## @@ -39,12 +35,15 @@ libvnet_la_SOURCES += \ vnet/config.c \ vnet/devices/devices.c \ vnet/devices/netlink.c \ + vnet/flow/flow.c \ + vnet/flow/flow_cli.c \ vnet/handoff.c \ vnet/interface.c \ vnet/interface_api.c \ vnet/interface_cli.c \ vnet/interface_format.c \ vnet/interface_output.c \ + vnet/interface_stats.c \ vnet/misc.c \ vnet/replication.c @@ -54,6 +53,7 @@ nobase_include_HEADERS += \ vnet/config.h \ vnet/devices/devices.h \ vnet/devices/netlink.h \ + vnet/flow/flow.h \ vnet/global_funcs.h \ vnet/handoff.h \ vnet/interface.h \ @@ -277,15 +277,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 @@ -357,12 +361,13 @@ libvnet_la_SOURCES += \ 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_in_out_acl.c \ + vnet/ip/ip_in_out_acl.c \ vnet/ip/lookup.c \ vnet/ip/ping.c \ vnet/ip/punt_api.c \ @@ -375,6 +380,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 \ @@ -397,6 +403,7 @@ nobase_include_HEADERS += \ API_FILES += \ vnet/ip/ip.api \ + vnet/ip/rd_cp.api \ vnet/ip/punt.api ######################################## @@ -582,6 +589,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 ######################################## @@ -808,26 +831,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 @@ -976,14 +999,19 @@ libvnet_la_SOURCES += \ 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 +######################################## +# TLS protocol +######################################## + +libvnet_la_SOURCES += vnet/tls/tls.c + +nobase_include_HEADERS += \ + vnet/tls/tls.h + ######################################## # Linux packet interface ######################################## @@ -1073,6 +1101,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 \ @@ -1086,6 +1115,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 += \ @@ -1187,6 +1217,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 ########################################