X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=923f61d8a0bd9d0e00ff1781ddd6bf91543d6f03;hb=68b0fb0c620c7451ef1a6380c43c39de6614db51;hp=78d864dcedea6c1694a20d049107e3b2b1bd9875;hpb=5842c78b20329e4072328fa3b71a2411dbbcebfc;p=vpp.git

diff --git a/src/vnet.am b/src/vnet.am
index 78d864dcede..923f61d8a0b 100644
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -324,11 +324,7 @@ libvnet_la_SOURCES +=				\
  vnet/ip/ip_input_acl.c				\
  vnet/ip/lookup.c				\
  vnet/ip/ping.c					\
- vnet/ip/punt.c					\
- vnet/ip/udp_format.c				\
- vnet/ip/udp_init.c				\
- vnet/ip/udp_local.c				\
- vnet/ip/udp_pg.c
+ vnet/ip/punt.c
 
 nobase_include_HEADERS +=			\
  vnet/ip/format.h				\
@@ -354,11 +350,7 @@ nobase_include_HEADERS +=			\
  vnet/ip/ports.def				\
  vnet/ip/protocols.def				\
  vnet/ip/punt_error.def				\
- vnet/ip/punt.h					\
- vnet/ip/tcp_packet.h				\
- vnet/ip/udp_error.def				\
- vnet/ip/udp.h					\
- vnet/ip/udp_packet.h
+ vnet/ip/punt.h
 
 API_FILES += vnet/ip/ip.api
 
@@ -473,6 +465,38 @@ test_map_LDADD = libvnet.la libvppinfra.la libvlib.la	\
 test_map_LDFLAGS = -static
 endif
 
+########################################
+# Layer 4 protocol: tcp
+########################################
+libvnet_la_SOURCES +=				\
+ 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/tcp.c
+
+nobase_include_HEADERS +=			\
+ vnet/tcp/tcp_packet.h				\
+ vnet/tcp/tcp_timer.h				\
+ vnet/tcp/tcp.h
+
+########################################
+# Layer 4 protocol: udp
+########################################
+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
+
+nobase_include_HEADERS +=			\
+  vnet/udp/udp_error.def                       	\
+  vnet/udp/udp.h                               	\
+  vnet/udp/udp_packet.h
 
 ########################################
 # Tunnel protocol: gre
@@ -578,7 +602,9 @@ libvnet_la_SOURCES +=				\
  vnet/lisp-cp/gid_dictionary.c			\
  vnet/lisp-cp/lisp_msg_serdes.c			\
  vnet/lisp-cp/packets.c				\
+ vnet/lisp-cp/one_cli.c				\
  vnet/lisp-cp/lisp_cli.c			\
+ vnet/lisp-cp/one_api.c				\
  vnet/lisp-cp/lisp_api.c
 
 nobase_include_HEADERS +=			\
@@ -588,9 +614,11 @@ nobase_include_HEADERS +=			\
  vnet/lisp-cp/lisp_cp_messages.h		\
  vnet/lisp-cp/lisp_msg_serdes.h			\
  vnet/lisp-cp/control.h				\
+ vnet/lisp-cp/one.api.h				\
  vnet/lisp-cp/lisp.api.h
 
 API_FILES += vnet/lisp-cp/lisp.api
+API_FILES += vnet/lisp-cp/one.api
 
 if ENABLE_TESTS
 LDS = \
@@ -670,7 +698,7 @@ libvnet_la_SOURCES +=				\
  vnet/dhcp/dhcp_api.c
 
 nobase_include_HEADERS +=			\
- vnet/dhcp/client.h					\
+ vnet/dhcp/client.h				\
  vnet/dhcp/dhcp.api.h
 
 API_FILES += vnet/dhcp/dhcp.api
@@ -679,13 +707,16 @@ API_FILES += vnet/dhcp/dhcp.api
 # DHCP proxy
 ########################################
 libvnet_la_SOURCES +=				\
- vnet/dhcp/proxy_node.c				\
- vnet/dhcp/proxy.h
+ vnet/dhcp/dhcp6_proxy_node.c                   \
+ vnet/dhcp/dhcp4_proxy_node.c			\
+ vnet/dhcp/dhcp_proxy.c
 
 nobase_include_HEADERS +=			\
- vnet/dhcp/packet.h				\
- vnet/dhcp/proxy.h				\
- vnet/dhcp/proxy_error.def
+ vnet/dhcp/dhcp4_packet.h		        \
+ vnet/dhcp/dhcp6_packet.h		        \
+ vnet/dhcp/dhcp_proxy.h				\
+ vnet/dhcp/dhcp6_proxy_error.def                \
+ vnet/dhcp/dhcp4_proxy_error.def
 
 ########################################
 # ipv6 segment routing
@@ -694,7 +725,6 @@ nobase_include_HEADERS +=			\
 if WITH_LIBSSL
 libvnet_la_SOURCES +=				\
  vnet/sr/sr.c					\
- vnet/sr/sr_replicate.c				\
  vnet/sr/sr_api.c
 endif
 
@@ -706,17 +736,6 @@ nobase_include_HEADERS +=			\
 
 API_FILES += vnet/sr/sr.api
 
-########################################
-# DHCPv6 proxy
-########################################
-libvnet_la_SOURCES +=				\
- vnet/dhcpv6/proxy_node.c
-
-nobase_include_HEADERS +=			\
- vnet/dhcpv6/packet.h				\
- vnet/dhcpv6/proxy.h				\
- vnet/dhcpv6/proxy_error.def
-
 ########################################
 # IPFIX / netflow v10
 ########################################
@@ -838,6 +857,28 @@ libvnet_la_SOURCES +=				\
 nobase_include_HEADERS +=			\
   vnet/devices/ssvm/ssvm_eth.h
 
+########################################
+# session managmeent
+########################################
+
+libvnet_la_SOURCES +=				\
+  vnet/session/session.c			\
+  vnet/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/session_api.c
+
+nobase_include_HEADERS +=			\
+  vnet/session/session.h			\
+  vnet/session/application.h			\
+  vnet/session/transport.h			\
+  vnet/session/application_interface.h
+
+API_FILES += vnet/session/session.api
+
 ########################################
 # Linux packet interface
 ########################################
@@ -959,12 +1000,14 @@ libvnet_la_SOURCES +=				\
   vnet/adj/adj_midchain.c   			\
   vnet/adj/adj_mcast.c   			\
   vnet/adj/adj_l2.c      			\
+  vnet/adj/adj_nsh.c      			\
   vnet/adj/adj.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
 
 ########################################