X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=8f884748d0f3071162ea6ed99188d7bc594f55f3;hb=75e7d1301475d49311d14e202936c62df0c07d10;hp=9a985ba193694d4b492b6fe9939445ab2cce2174;hpb=42998828c9bfa419ff3d9c68fd50cd148e24d4e4;p=vpp.git

diff --git a/src/vnet.am b/src/vnet.am
index 9a985ba1936..8f884748d0f 100644
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -343,6 +343,7 @@ 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_punt_drop.c			\
@@ -350,6 +351,7 @@ libvnet_la_SOURCES +=				\
  vnet/ip/ip6_input.c				\
  vnet/ip/ip6_neighbor.c				\
  vnet/ip/ip6_pg.c				\
+ vnet/ip/ip6_reassembly.c                       \
  vnet/ip/ip_api.c				\
  vnet/ip/ip_checksum.c				\
  vnet/ip/ip_frag.c				\
@@ -504,10 +506,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 +524,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 +539,22 @@ nobase_include_HEADERS +=			\
 
 API_FILES += vnet/udp/udp.api
 
+########################################
+# Layer 4 protocol: sctp
+########################################
+libvnet_la_SOURCES +=				\
+  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
+
 ########################################
 # Tunnel protocol: gre
 ########################################
@@ -724,7 +737,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 +=			\
@@ -904,16 +917,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 +957,20 @@ 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
+
 ########################################
 # Linux packet interface
 ########################################
@@ -1114,7 +1131,7 @@ libvnet_la_SOURCES +=				\
   vnet/dpo/mpls_disposition.c   		\
   vnet/dpo/mpls_label_dpo.c			\
   vnet/dpo/l3_proxy_dpo.c			\
-  vnet/dpo/l2_bridge_dpo.c
+  vnet/dpo/dvr_dpo.c
 
 nobase_include_HEADERS +=			\
   vnet/dpo/load_balance.h			\