X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=3a1e10d7d8b8818230f323d7ace4a03b099ec2ef;hb=7f358b3;hp=9548509715d1d470f159f392d8a432ce572fb203;hpb=aaacfbc5b15b0653489ad2e80db48151a4375ece;p=vpp.git

diff --git a/src/vnet.am b/src/vnet.am
index 9548509715d..3a1e10d7d8b 100644
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -35,12 +35,15 @@ libvnet_la_SOURCES +=				\
   vnet/config.c					\
   vnet/devices/devices.c			\
   vnet/devices/netlink.c			\
+  vnet/flow/flow.c				\
+  vnet/flow/flow_cli.c				\
   vnet/handoff.c				\
   vnet/interface.c				\
   vnet/interface_api.c				\
   vnet/interface_cli.c				\
   vnet/interface_format.c			\
   vnet/interface_output.c			\
+  vnet/interface_stats.c			\
   vnet/misc.c					\
   vnet/replication.c
 
@@ -50,6 +53,7 @@ nobase_include_HEADERS +=			\
   vnet/config.h					\
   vnet/devices/devices.h			\
   vnet/devices/netlink.h			\
+  vnet/flow/flow.h				\
   vnet/global_funcs.h				\
   vnet/handoff.h				\
   vnet/interface.h				\
@@ -272,6 +276,21 @@ nobase_include_HEADERS +=			\
 
 API_FILES += vnet/geneve/geneve.api
 
+########################################
+# Layer 2 / Bonding
+########################################
+libvnet_la_SOURCES +=				\
+  vnet/bonding/cli.c    			\
+  vnet/bonding/node.c    			\
+  vnet/bonding/device.c    			\
+  vnet/bonding/bond_api.c
+
+nobase_include_HEADERS +=			\
+  vnet/bonding/node.h                           \
+  vnet/bonding/bond.api.h
+
+API_FILES += vnet/bonding/bond.api
+
 ########################################
 # Layer 2 / LLDP
 ########################################
@@ -342,12 +361,14 @@ libvnet_la_SOURCES +=				\
  vnet/ip/ip6_neighbor.c				\
  vnet/ip/ip6_pg.c				\
  vnet/ip/ip6_reassembly.c                       \
+ vnet/ip/rd_cp.c                                \
+ vnet/ip/ip_neighbor.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_in_out_acl.c				\
+ vnet/ip/ip_in_out_acl.c			\
  vnet/ip/lookup.c				\
  vnet/ip/ping.c					\
  vnet/ip/punt_api.c				\
@@ -360,6 +381,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				\
@@ -373,6 +395,7 @@ nobase_include_HEADERS +=			\
  vnet/ip/ip.h					\
  vnet/ip/ip_packet.h				\
  vnet/ip/ip_source_and_port_range_check.h	\
+ vnet/ip/ip_neighbor.h				\
  vnet/ip/lookup.h				\
  vnet/ip/ports.def				\
  vnet/ip/protocols.def				\
@@ -382,6 +405,7 @@ nobase_include_HEADERS +=			\
 
 API_FILES += 					\
  vnet/ip/ip.api 				\
+ vnet/ip/rd_cp.api                              \
  vnet/ip/punt.api
 
 ########################################
@@ -567,6 +591,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
 ########################################
@@ -793,26 +833,26 @@ API_FILES += vnet/srmpls/sr_mpls.api
 # IPFIX / netflow v10
 ########################################
 libvnet_la_SOURCES +=				\
- vnet/flow/flow_report.c			\
- vnet/flow/flow_api.c
+ vnet/ipfix-export/flow_report.c			\
+ vnet/ipfix-export/flow_api.c
 
 nobase_include_HEADERS +=			\
- vnet/flow/flow_report.h			\
- vnet/flow/ipfix_info_elements.h		\
- vnet/flow/ipfix_packet.h			\
- vnet/flow/flow.api.h
+ vnet/ipfix-export/flow_report.h			\
+ vnet/ipfix-export/ipfix_info_elements.h		\
+ vnet/ipfix-export/ipfix_packet.h			\
+ vnet/ipfix-export/ipfix_export.api.h
 
-API_FILES += vnet/flow/flow.api
+API_FILES += vnet/ipfix-export/ipfix_export.api
 
 ########################################
 # IPFIX classify code
 ########################################
 
 libvnet_la_SOURCES +=				\
-  vnet/flow/flow_report_classify.c
+  vnet/ipfix-export/flow_report_classify.c
 
 nobase_include_HEADERS +=			\
-  vnet/flow/flow_report_classify.h
+  vnet/ipfix-export/flow_report_classify.h
 
 ########################################
 # lawful intercept
@@ -1063,6 +1103,7 @@ libvnet_la_SOURCES +=				\
   vnet/fib/fib_entry_src.c                      \
   vnet/fib/fib_entry_src_rr.c                   \
   vnet/fib/fib_entry_src_interface.c            \
+  vnet/fib/fib_entry_src_interpose.c            \
   vnet/fib/fib_entry_src_default_route.c        \
   vnet/fib/fib_entry_src_special.c              \
   vnet/fib/fib_entry_src_api.c                  \
@@ -1076,6 +1117,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 +=			\
@@ -1177,6 +1219,22 @@ libvnet_la_SOURCES +=                    \
   vnet/util/refcount.c			 \
   vnet/util/trajectory.c
 
+########################################
+# QoS
+########################################
+
+libvnet_la_SOURCES +=      	                \
+  vnet/qos/qos_types.c				\
+  vnet/qos/qos_api.c				\
+  vnet/qos/qos_egress_map.c			\
+  vnet/qos/qos_record.c				\
+  vnet/qos/qos_mark.c
+
+API_FILES += vnet/qos/qos.api
+
+nobase_include_HEADERS +=                       \
+ vnet/qos/qos.api.h
+
 ########################################
 # BIER
 ########################################