X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=ede0376de1efd3f37b1c023aa6f5ed8959955670;hb=52851e6aa9304054fd1059c8dd284abf8e532bf2;hp=6e35df8713ac621137dec959cc9e55a7e86ee27c;hpb=a774b53623f60b5e8ea8ed634d6a41e847743715;p=vpp.git

diff --git a/src/vnet.am b/src/vnet.am
index 6e35df8713a..ede0376de1e 100644
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -113,7 +113,10 @@ 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
 
 nobase_include_HEADERS +=			\
  vnet/ethernet/arp_packet.h			\
@@ -121,7 +124,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
@@ -263,10 +270,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"
@@ -462,6 +474,8 @@ libvnet_la_SOURCES +=				\
  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
 
@@ -697,21 +711,31 @@ 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/srv6/sr.api
+
+########################################
+# mpls segment routing
+########################################
+
+libvnet_la_SOURCES +=				\
+ vnet/srmpls/sr_mpls_policy.c		\
+ vnet/srmpls/sr_mpls_steering.c
+
 
-API_FILES += vnet/sr/sr.api
+nobase_include_HEADERS +=			\
+ vnet/srmpls/sr.h
 
 ########################################
 # IPFIX / netflow v10
@@ -810,19 +834,22 @@ nobase_include_HEADERS +=			\
 
 libvnet_la_SOURCES +=				\
   vnet/session/session.c			\
-  vnet/session/node.c				\
-  vnet/session/transport.c			\
+  vnet/session/session_lookup.c			\
+  vnet/session/session_node.c			\
+  vnet/session/transport_interface.c		\
   vnet/session/application.c			\
   vnet/session/session_cli.c			\
-  vnet/session/hashes.c				\
   vnet/session/application_interface.c		\
   vnet/session/segment_manager.c		\
   vnet/session/session_api.c
 
 nobase_include_HEADERS +=			\
   vnet/session/session.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/session_debug.h			\
   vnet/session/segment_manager.h		\