Pipes
[vpp.git] / src / vnet.am
index bc9655c..d6a5d52 100644 (file)
@@ -12,6 +12,7 @@
 # limitations under the License.
 
 lib_LTLIBRARIES += libvnet.la
+noinst_LTLIBRARIES =
 
 libvnet_la_SOURCES =
 libvnet_la_DEPENDENCIES = \
@@ -19,9 +20,8 @@ libvnet_la_DEPENDENCIES = \
        libvlib.la              \
        libsvmdb.la             \
        libsvm.la               \
-       libvlibapi.la           \
-       libvlibmemory.la        \
-       libvlibmemoryclient.la
+       libvlibmemory.la
+libvnet_multiversioning_sources =
 
 libvnet_la_LIBADD = $(libvnet_la_DEPENDENCIES) -lm -lpthread -ldl -lrt
 
@@ -33,36 +33,44 @@ endif
 # Generic stuff
 ########################################
 libvnet_la_SOURCES +=                          \
+  vnet/buffer.c                                        \
   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                           \
-  vnet/rewrite.c
+  vnet/replication.c
 
 nobase_include_HEADERS +=                      \
   vnet/api_errno.h                             \
   vnet/buffer.h                                        \
   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                             \
   vnet/interface.api.h                         \
   vnet/interface_funcs.h                       \
+  vnet/ip/ip4_to_ip6.h                         \
+  vnet/ip/ip6_to_ip4.h                         \
   vnet/l3_types.h                              \
   vnet/pipeline.h                              \
   vnet/replication.h                           \
-  vnet/rewrite.h                               \
   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
 
@@ -115,7 +123,13 @@ libvnet_la_SOURCES +=                              \
  vnet/ethernet/interface.c                     \
  vnet/ethernet/node.c                          \
  vnet/ethernet/pg.c                            \
- vnet/ethernet/sfp.c
+ vnet/ethernet/sfp.c                           \
+ vnet/ethernet/p2p_ethernet.c                  \
+ vnet/ethernet/p2p_ethernet_input.c            \
+ vnet/ethernet/p2p_ethernet_api.c
+
+libvnet_multiversioning_sources +=             \
+ vnet/l2/l2_output.c
 
 nobase_include_HEADERS +=                      \
  vnet/ethernet/arp_packet.h                    \
@@ -123,7 +137,11 @@ nobase_include_HEADERS +=                  \
  vnet/ethernet/ethernet.h                      \
  vnet/ethernet/packet.h                                \
  vnet/ethernet/types.def                       \
- vnet/ethernet/sfp.h
+ vnet/ethernet/sfp.h                           \
+ vnet/ethernet/p2p_ethernet.api.h              \
+ vnet/ethernet/p2p_ethernet.h
+
+API_FILES += vnet/ethernet/p2p_ethernet.api
 
 ########################################
 # Layer 2 protocol: Ethernet bridging
@@ -139,12 +157,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                              \
@@ -248,15 +265,39 @@ nobase_include_HEADERS +=                 \
 API_FILES += vnet/vxlan/vxlan.api
 
 ########################################
-# Layer 2 / CDP
+# Layer 2 / Geneve
+########################################
+libvnet_la_SOURCES +=                          \
+  vnet/geneve/geneve.c                         \
+  vnet/geneve/encap.c                          \
+  vnet/geneve/decap.c                          \
+  vnet/geneve/geneve_api.c
+
+nobase_include_HEADERS +=                      \
+  vnet/geneve/geneve.h                         \
+  vnet/geneve/geneve_packet.h                  \
+  vnet/geneve/geneve_error.def                 \
+  vnet/geneve/geneve.api.h
+
+API_FILES += vnet/geneve/geneve.api
+
+########################################
+# 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
+
+libvnet_multiversioning_sources +=             \
+  vnet/bonding/node.c
+
+API_FILES += vnet/bonding/bond.api
 
 ########################################
 # Layer 2 / LLDP
@@ -265,10 +306,15 @@ libvnet_la_SOURCES +=                             \
   vnet/lldp/lldp_input.c                       \
   vnet/lldp/lldp_node.c                                \
   vnet/lldp/lldp_output.c                      \
-  vnet/lldp/lldp_cli.c
+  vnet/lldp/lldp_cli.c                          \
+  vnet/lldp/lldp_api.c
 
 nobase_include_HEADERS +=                      \
-  vnet/lldp/lldp_protocol.h
+  vnet/lldp/lldp_protocol.h                     \
+  vnet/lldp/lldp.h                              \
+  vnet/lldp/lldp.api.h
+
+API_FILES += vnet/lldp/lldp.api
 
 ########################################
 # Layer 2/3 "classify"
@@ -276,7 +322,7 @@ nobase_include_HEADERS +=                   \
 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            \
@@ -285,7 +331,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
@@ -306,25 +352,35 @@ libvnet_la_SOURCES +=                             \
  vnet/ip/ip46_cli.c                            \
  vnet/ip/ip4_format.c                          \
  vnet/ip/ip4_forward.c                         \
+ vnet/ip/ip4_punt_drop.c                       \
  vnet/ip/ip4_input.c                           \
+ vnet/ip/ip4_options.c                         \
  vnet/ip/ip4_mtrie.c                           \
  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_neighbor.c                         \
  vnet/ip/ip_api.c                              \
  vnet/ip/ip_checksum.c                         \
  vnet/ip/ip_frag.c                             \
- vnet/ip/ip.h                                  \
+ 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                            \
  vnet/ip/punt.c
 
 nobase_include_HEADERS +=                      \
@@ -334,6 +390,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                           \
@@ -347,13 +404,21 @@ nobase_include_HEADERS +=                 \
  vnet/ip/ip.h                                  \
  vnet/ip/ip_packet.h                           \
  vnet/ip/ip_source_and_port_range_check.h      \
+ vnet/ip/ip_neighbor.h                         \
  vnet/ip/lookup.h                              \
  vnet/ip/ports.def                             \
  vnet/ip/protocols.def                         \
  vnet/ip/punt_error.def                                \
+ vnet/ip/punt.api.h                            \
  vnet/ip/punt.h
 
-API_FILES += vnet/ip/ip.api
+API_FILES +=                                   \
+ vnet/ip/ip.api                                \
+ vnet/ip/rd_cp.api                              \
+ vnet/ip/punt.api
+
+libvnet_multiversioning_sources +=             \
+ vnet/ip/ip4_input.c
 
 ########################################
 # Bidirectional Forwarding Detection
@@ -387,9 +452,11 @@ libvnet_la_SOURCES +=                              \
  vnet/ipsec/ipsec_input.c                      \
  vnet/ipsec/ipsec_if.c                         \
  vnet/ipsec/ipsec_if_in.c                      \
- vnet/ipsec/ipsec_if_out.c                     \
+ vnet/ipsec/esp_format.c                       \
  vnet/ipsec/esp_encrypt.c                      \
  vnet/ipsec/esp_decrypt.c                      \
+ vnet/ipsec/ah_decrypt.c                       \
+ vnet/ipsec/ah_encrypt.c                       \
  vnet/ipsec/ikev2.c                            \
  vnet/ipsec/ikev2_crypto.c                     \
  vnet/ipsec/ikev2_cli.c                                \
@@ -406,6 +473,7 @@ libvnet_la_SOURCES +=                               \
 nobase_include_HEADERS +=                      \
  vnet/ipsec/ipsec.h                            \
  vnet/ipsec/esp.h                              \
+ vnet/ipsec/ah.h                               \
  vnet/ipsec/ikev2.h                            \
  vnet/ipsec/ikev2_priv.h                       \
  vnet/ipsec/ipsec.api.h
@@ -421,55 +489,28 @@ libvnet_la_SOURCES +=                             \
 nobase_include_HEADERS +=                      \
  vnet/osi/osi.h
 
-########################################
-# Layer 3 protocol: MAP
-########################################
-libvnet_la_SOURCES +=                          \
- vnet/map/map.c                                        \
- vnet/map/map_dpo.c                            \
- vnet/map/ip4_map.c                            \
- vnet/map/ip6_map.c                            \
- vnet/map/ip4_map_t.c                          \
- vnet/map/ip6_map_t.c                          \
- vnet/map/map_api.c
-
-nobase_include_HEADERS +=                      \
- vnet/map/map.h                                        \
- vnet/map/map_dpo.h                            \
- vnet/map/map.api.h
-
-API_FILES += vnet/map/map.api
-
-if ENABLE_TESTS
-TESTS += test_map
-test_map_SOURCES =                             \
- vnet/map/test.c
-test_map_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-
-test_map_LDADD = libvnet.la libvppinfra.la libvlib.la  \
-  -lpthread -lvlibmemory -lvlibapi \
-  -ldl -lsvm -lrt
-
-test_map_LDFLAGS = -static
-endif
-
 ########################################
 # Layer 4 protocol: tcp
 ########################################
 libvnet_la_SOURCES +=                          \
+ vnet/tcp/tcp_api.c                            \
  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_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.h
+ vnet/tcp/tcp_debug.h                          \
+ vnet/tcp/tcp.h                                        \
+ vnet/tcp/tcp.api.h
+
+API_FILES += vnet/tcp/tcp.api
 
 ########################################
 # Layer 4 protocol: udp
@@ -477,15 +518,40 @@ nobase_include_HEADERS +=                 \
 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
+ vnet/udp/udp_pg.c                             \
+ vnet/udp/udp_encap_node.c                     \
+ vnet/udp/udp_encap.c                          \
+ vnet/udp/udp_api.c
 
 nobase_include_HEADERS +=                      \
   vnet/udp/udp_error.def                               \
   vnet/udp/udp.h                                       \
-  vnet/udp/udp_packet.h
+  vnet/udp/udp_packet.h                                \
+  vnet/udp/udp.api.h
+
+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
@@ -505,6 +571,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
 ########################################
@@ -530,7 +612,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                                \
@@ -616,7 +698,6 @@ LDS = \
   libvlib.la  \
   libsvm.la \
   libsvmdb.la \
-  libvlibapi.la \
   libvlibmemory.la \
   -lpthread -ldl -lrt -lm
 
@@ -665,32 +746,32 @@ nobase_include_HEADERS +=                 \
 
 API_FILES += vnet/lisp-gpe/lisp_gpe.api
 
-if ENABLE_TESTS
-TESTS += test_test
-
-test_test_SOURCES = tests/vnet/lisp-gpe/test.c
-
-test_test_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-
-test_test_LDADD = $(LIBOBJS)
-
-noinst_PROGRAMS += $(TESTS)
-check_PROGRAMS += $(TESTS)
-endif
-
 ########################################
 # DHCP client
 ########################################
 libvnet_la_SOURCES +=                          \
  vnet/dhcp/client.c                            \
- vnet/dhcp/client.h                            \
+ vnet/dhcp/dhcp_client_detect.c                        \
+ vnet/dhcp/dhcp6_client_common_dp.c            \
+ vnet/dhcp/dhcp6_pd_client_dp.c                        \
+ vnet/dhcp/dhcp6_pd_client_cp.c                        \
+ vnet/dhcp/dhcp6_ia_na_client_dp.c             \
+ vnet/dhcp/dhcp6_ia_na_client_cp.c             \
  vnet/dhcp/dhcp_api.c
 
 nobase_include_HEADERS +=                      \
  vnet/dhcp/client.h                            \
- vnet/dhcp/dhcp.api.h
+ vnet/dhcp/dhcp6_client_common_dp.h            \
+ vnet/dhcp/dhcp6_pd_client_dp.h                        \
+ vnet/dhcp/dhcp6_ia_na_client_dp.h             \
+ vnet/dhcp/dhcp.api.h                          \
+ vnet/dhcp/dhcp6_pd_client_cp.api.h            \
+ vnet/dhcp/dhcp6_ia_na_client_cp.api.h
 
-API_FILES += vnet/dhcp/dhcp.api
+API_FILES +=                                   \
+ vnet/dhcp/dhcp.api                            \
+ vnet/dhcp/dhcp6_pd_client_cp.api              \
+ vnet/dhcp/dhcp6_ia_na_client_cp.api
 
 ########################################
 # DHCP proxy
@@ -711,46 +792,60 @@ nobase_include_HEADERS +=                 \
 # ipv6 segment routing
 ########################################
 
-if WITH_LIBSSL
 libvnet_la_SOURCES +=                          \
- 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
+ vnet/srv6/sr.c                                                \
+ vnet/srv6/sr_localsid.c                       \
+ vnet/srv6/sr_policy_rewrite.c         \
+ vnet/srv6/sr_steering.c                       \
+ vnet/srv6/sr_api.c
 
 nobase_include_HEADERS +=                      \
- vnet/sr/sr_packet.h                           \
- vnet/sr/sr.h                                          \
- vnet/sr/sr.api.h
+ vnet/srv6/sr_packet.h                         \
+ vnet/srv6/sr.h                                        \
+ vnet/srv6/sr.api.h
 
-API_FILES += vnet/sr/sr.api
+API_FILES += vnet/srv6/sr.api
+
+########################################
+# mpls segment routing
+########################################
+
+libvnet_la_SOURCES +=                          \
+ vnet/srmpls/sr_mpls_policy.c          \
+ vnet/srmpls/sr_mpls_steering.c   \
+ vnet/srmpls/sr_mpls_api.c
+
+
+nobase_include_HEADERS +=                      \
+ vnet/srmpls/sr_mpls.h      \
+ vnet/srmpls/sr_mpls.api.h
+
+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
@@ -778,6 +873,23 @@ nobase_include_HEADERS +=                  \
 
 API_FILES += vnet/span/span.api
 
+########################################
+# DNS proxy, API
+########################################
+libvnet_la_SOURCES +=                          \
+ vnet/dns/dns.c                                        \
+ vnet/dns/dns.h                                        \
+ vnet/dns/dns_packet.h                         \
+ vnet/dns/reply_node.c                         \
+ vnet/dns/request_node.c                       \
+ vnet/dns/resolver_process.c
+
+nobase_include_HEADERS +=                      \
+ vnet/dns/dns.api.h                            \
+ vnet/dns/dns.h
+
+API_FILES += vnet/dns/dns.api
+
 ########################################
 # Packet generator
 ########################################
@@ -788,35 +900,62 @@ libvnet_la_SOURCES +=                             \
   vnet/pg/init.c                               \
   vnet/pg/input.c                              \
   vnet/pg/output.c                             \
-  vnet/pg/stream.c
+  vnet/pg/stream.c                             \
+  vnet/pg/pg_api.c
 
 nobase_include_HEADERS +=                      \
   vnet/pg/pg.h                                 \
-  vnet/pg/edit.h
+  vnet/pg/edit.h                               \
+  vnet/pg/pg.api.h
+
+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
+
+########################################
+# tap interface (with virtio backend)
+########################################
+
+libvnet_la_SOURCES +=                          \
+  vnet/devices/pipe/pipe_api.c                 \
+  vnet/devices/pipe/pipe.c
+
+nobase_include_HEADERS +=                      \
+  vnet/devices/pipe/pipe.h
+
+API_FILES += vnet/devices/pipe/pipe.api
 
 ########################################
 # session managmeent
@@ -824,23 +963,63 @@ nobase_include_HEADERS +=                 \
 
 libvnet_la_SOURCES +=                          \
   vnet/session/session.c                       \
-  vnet/session/node.c                          \
+  vnet/session/session_table.c                 \
+  vnet/session/session_rules_table.c           \
+  vnet/session/session_lookup.c                        \
+  vnet/session/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/application_namespace.c         \
+  vnet/session/segment_manager.c               \
+  vnet/session/session_test.c                  \
   vnet/session/session_api.c
 
 nobase_include_HEADERS +=                      \
   vnet/session/session.h                       \
+  vnet/session/session_table.h                 \
+  vnet/session/session_rules_table.h           \
+  vnet/session/stream_session.h                        \
+  vnet/session/session_lookup.h                        \
   vnet/session/application.h                   \
   vnet/session/transport.h                     \
+  vnet/session/transport_interface.h           \
   vnet/session/application_interface.h         \
+  vnet/session/application_namespace.h         \
+  vnet/session/session_debug.h                 \
+  vnet/session/segment_manager.h               \
+  vnet/session/mma_template.h                  \
+  vnet/session/mma_template.c                  \
+  vnet/session/mma_16.h                                \
+  vnet/session/mma_40.h                                \
   vnet/session/session.api.h
 
 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
 ########################################
@@ -881,10 +1060,14 @@ API_FILES += vnet/devices/netmap/netmap.api
 
 libvnet_la_SOURCES +=                          \
   vnet/feature/feature.c                       \
+  vnet/feature/feature_api.c                   \
   vnet/feature/registration.c
 
 nobase_include_HEADERS +=                      \
-  vnet/feature/feature.h
+  vnet/feature/feature.h                       \
+  vnet/feature/feature.api.h
+
+API_FILES += vnet/feature/feature.api
 
 ########################################
 # Unix kernel related
@@ -926,6 +1109,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                  \
@@ -938,7 +1122,9 @@ libvnet_la_SOURCES +=                              \
   vnet/fib/fib_path.c                          \
   vnet/fib/fib_path_ext.c                      \
   vnet/fib/fib_urpf_list.c                     \
-  vnet/fib/fib_attached_export.c
+  vnet/fib/fib_attached_export.c               \
+  vnet/fib/fib_api.c                           \
+  vnet/fib/fib_bfd.c
 
 nobase_include_HEADERS +=                      \
   vnet/fib/fib.h                               \
@@ -963,14 +1149,18 @@ libvnet_la_SOURCES +=                            \
   vnet/adj/adj_mcast.c                         \
   vnet/adj/adj_l2.c                            \
   vnet/adj/adj_nsh.c                           \
-  vnet/adj/adj.c
+  vnet/adj/adj.c                               \
+  vnet/adj/rewrite.c                           \
+  vnet/adj/adj_bfd.c                           \
+  vnet/adj/adj_delegate.c
 
 nobase_include_HEADERS +=                      \
   vnet/adj/adj.h                               \
   vnet/adj/adj_types.h                         \
   vnet/adj/adj_glean.h                         \
   vnet/adj/adj_nsh.h                           \
-  vnet/adj/adj_nbr.h
+  vnet/adj/adj_nbr.h                           \
+  vnet/adj/rewrite.h
 
 ########################################
 # Data-Plane Objects
@@ -980,6 +1170,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                      \
@@ -987,7 +1178,12 @@ libvnet_la_SOURCES +=                             \
   vnet/dpo/lookup_dpo.c                        \
   vnet/dpo/classify_dpo.c                      \
   vnet/dpo/replicate_dpo.c                     \
-  vnet/dpo/mpls_label_dpo.c
+  vnet/dpo/interface_rx_dpo.c                          \
+  vnet/dpo/interface_tx_dpo.c                          \
+  vnet/dpo/mpls_disposition.c                  \
+  vnet/dpo/mpls_label_dpo.c                    \
+  vnet/dpo/l3_proxy_dpo.c                      \
+  vnet/dpo/dvr_dpo.c
 
 nobase_include_HEADERS +=                      \
   vnet/dpo/load_balance.h                      \
@@ -997,6 +1193,7 @@ nobase_include_HEADERS +=                  \
   vnet/dpo/classify_dpo.h                      \
   vnet/dpo/receive_dpo.h                       \
   vnet/dpo/ip_null_dpo.h                       \
+  vnet/dpo/replicate_dpo.h                     \
   vnet/dpo/dpo.h
 
 ########################################
@@ -1024,7 +1221,101 @@ nobase_include_HEADERS +=                       \
 ########################################
 
 libvnet_la_SOURCES +=                    \
-  vnet/util/radix.c
+  vnet/util/radix.c                         \
+  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
+########################################
+
+libvnet_la_SOURCES +=                           \
+  vnet/bier/bier_bit_string.c                   \
+  vnet/bier/bier_entry.c                        \
+  vnet/bier/bier_fmask.c                        \
+  vnet/bier/bier_fmask_db.c                     \
+  vnet/bier/bier_input.c                       \
+  vnet/bier/bier_lookup.c                      \
+  vnet/bier/bier_output.c                      \
+  vnet/bier/bier_table.c                        \
+  vnet/bier/bier_types.c                        \
+  vnet/bier/bier_test.c                         \
+  vnet/bier/bier_api.c                          \
+  vnet/bier/bier_drop.c                         \
+  vnet/bier/bier_update.c                      \
+  vnet/bier/bier_imp_node.c                    \
+  vnet/bier/bier_imp.c                         \
+  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_bift_table.c
+
+nobase_include_HEADERS +=                      \
+  vnet/bier/bier_types.h                        \
+  vnet/bier/bier_entry.h                        \
+  vnet/bier/bier_update.h                       \
+  vnet/bier/bier.api.h                          \
+  vnet/bier/bier_table.h
+
+API_FILES += vnet/bier/bier.api
+
+if CPU_X86_64
+if CC_SUPPORTS_AVX2
+###############################################################
+# AVX2
+###############################################################
+libvnet_avx2_la_SOURCES = $(libvnet_multiversioning_sources)
+libvnet_avx2_la_CFLAGS =                       \
+       $(AM_CFLAGS)  @CPU_AVX2_FLAGS@          \
+       -DCLIB_MARCH_VARIANT=avx2
+noinst_LTLIBRARIES += libvnet_avx2.la
+libvnet_la_LIBADD += libvnet_avx2.la
+endif
+
+if CC_SUPPORTS_AVX512
+###############################################################
+# AVX512
+###############################################################
+libvnet_avx512_la_SOURCES = $(libvnet_multiversioning_sources)
+libvnet_avx512_la_CFLAGS =                     \
+       $(AM_CFLAGS) @CPU_AVX512_FLAGS@         \
+       -DCLIB_MARCH_VARIANT=avx512
+noinst_LTLIBRARIES += libvnet_avx512.la
+libvnet_la_LIBADD += libvnet_avx512.la
+endif
+endif
+
+########################################
+# 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
@@ -1040,6 +1331,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