X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=adf93398648f00778ca958225995d7f34bbc861a;hb=a9855ef839ab99d7e66b9dd8d706b14cc8cd77dd;hp=a08b4bb51087e7d629b7d85b717d5fa5a6f8b330;hpb=d77eee64b17762bf21f8dbe0b9f955513f81f1a5;p=vpp.git

diff --git a/src/vnet.am b/src/vnet.am
index a08b4bb5108..adf93398648 100644
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -41,6 +41,7 @@ libvnet_la_SOURCES +=				\
   vnet/interface_cli.c				\
   vnet/interface_format.c			\
   vnet/interface_output.c			\
+  vnet/interface_stats.c			\
   vnet/misc.c					\
   vnet/replication.c
 
@@ -273,15 +274,19 @@ nobase_include_HEADERS +=			\
 API_FILES += vnet/geneve/geneve.api
 
 ########################################
-# Layer 2 / CDP
+# Layer 2 / Bonding
 ########################################
 libvnet_la_SOURCES +=				\
-  vnet/cdp/cdp_input.c				\
-  vnet/cdp/cdp_node.c				\
-  vnet/cdp/cdp_periodic.c
+  vnet/bonding/cli.c    			\
+  vnet/bonding/node.c    			\
+  vnet/bonding/device.c    			\
+  vnet/bonding/bond_api.c
 
 nobase_include_HEADERS +=			\
-  vnet/cdp/cdp_protocol.h
+  vnet/bonding/node.h                           \
+  vnet/bonding/bond.api.h
+
+API_FILES += vnet/bonding/bond.api
 
 ########################################
 # Layer 2 / LLDP
@@ -353,12 +358,13 @@ 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_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				\
@@ -371,6 +377,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				\
@@ -393,6 +400,7 @@ nobase_include_HEADERS +=			\
 
 API_FILES += 					\
  vnet/ip/ip.api 				\
+ vnet/ip/rd_cp.api                              \
  vnet/ip/punt.api
 
 ########################################
@@ -578,6 +586,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
 ########################################
@@ -804,26 +828,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
@@ -1074,6 +1098,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                  \
@@ -1087,6 +1112,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 +=			\
@@ -1188,6 +1214,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
 ########################################