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

diff --git a/src/vnet.am b/src/vnet.am
index 8f884748d0f..4f968474131 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				\
@@ -273,17 +272,6 @@ nobase_include_HEADERS +=			\
 
 API_FILES += vnet/geneve/geneve.api
 
-########################################
-# Layer 2 / CDP
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/cdp/cdp_input.c				\
-  vnet/cdp/cdp_node.c				\
-  vnet/cdp/cdp_periodic.c
-
-nobase_include_HEADERS +=			\
-  vnet/cdp/cdp_protocol.h
-
 ########################################
 # Layer 2 / LLDP
 ########################################
@@ -307,7 +295,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 +304,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
@@ -346,18 +334,21 @@ libvnet_la_SOURCES +=				\
  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_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				\
@@ -370,6 +361,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				\
@@ -392,6 +384,7 @@ nobase_include_HEADERS +=			\
 
 API_FILES += 					\
  vnet/ip/ip.api 				\
+ vnet/ip/rd_cp.api                              \
  vnet/ip/punt.api
 
 ########################################
@@ -543,6 +536,7 @@ 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			\
@@ -553,7 +547,10 @@ 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.h				\
+  vnet/sctp/sctp.api.h
+
+API_FILES += vnet/sctp/sctp.api
 
 ########################################
 # Tunnel protocol: gre
@@ -573,6 +570,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
 ########################################
@@ -971,6 +984,15 @@ 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
 ########################################
@@ -1073,6 +1095,7 @@ libvnet_la_SOURCES +=				\
   vnet/fib/fib_path_ext.c			\
   vnet/fib/fib_urpf_list.c			\
   vnet/fib/fib_attached_export.c		\
+  vnet/fib/fib_api.c				\
   vnet/fib/fib_bfd.c
 
 nobase_include_HEADERS +=			\
@@ -1119,6 +1142,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			\
@@ -1237,6 +1261,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