X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=a5fb061c5d675efc1b91053798e47ed120e28a41;hb=a44b015aa012d3b07ed873925d47c6d5955b7dd2;hp=ae125bc57ef80fabf55845644fc2a80566e2bad6;hpb=9128637ee8f7b0d903551f165a1447d427e8dd19;p=vpp.git

diff --git a/src/vnet.am b/src/vnet.am
index ae125bc57ef..a5fb061c5d6 100644
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -148,12 +148,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				\
@@ -307,7 +306,7 @@ API_FILES += vnet/lldp/lldp.api
 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            \
@@ -316,7 +315,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
@@ -343,6 +342,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,12 +350,13 @@ 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				\
  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				\
@@ -504,10 +505,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 +523,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 +538,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 +736,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 +=			\
@@ -772,11 +784,15 @@ API_FILES += vnet/srv6/sr.api
 
 libvnet_la_SOURCES +=				\
  vnet/srmpls/sr_mpls_policy.c		\
- vnet/srmpls/sr_mpls_steering.c
+ vnet/srmpls/sr_mpls_steering.c   \
+ vnet/srmpls/sr_mpls_api.c
 
 
 nobase_include_HEADERS +=			\
- vnet/srmpls/sr.h
+ vnet/srmpls/sr_mpls.h      \
+ vnet/srmpls/sr_mpls.api.h
+
+API_FILES += vnet/srmpls/sr_mpls.api
 
 ########################################
 # IPFIX / netflow v10
@@ -900,16 +916,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
 ########################################
@@ -950,6 +956,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
 ########################################
@@ -1110,7 +1130,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			\
@@ -1187,6 +1207,21 @@ nobase_include_HEADERS +=			\
 
 API_FILES += vnet/bier/bier.api
 
+########################################
+# 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
 ########################################