X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=19b215f6eab338f6c49b2dab2ec287f9f86ae8ef;hb=cea194d8f973a2f2b5ef72d212533057174cc70a;hp=121d1a9c6a241488d8b1893d81b1567a1e018848;hpb=5d73eecd63018db69b10bf56adeec9cc5cf92790;p=vpp.git

diff --git a/src/vnet.am b/src/vnet.am
index 121d1a9c6a2..19b215f6eab 100644
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -113,7 +113,10 @@ libvnet_la_SOURCES +=				\
  vnet/ethernet/interface.c			\
  vnet/ethernet/node.c				\
  vnet/ethernet/pg.c				\
- vnet/ethernet/sfp.c
+ vnet/ethernet/sfp.c				\
+ vnet/ethernet/p2p_ethernet.c			\
+ vnet/ethernet/p2p_ethernet_input.c		\
+ vnet/ethernet/p2p_ethernet_api.c
 
 nobase_include_HEADERS +=			\
  vnet/ethernet/arp_packet.h			\
@@ -121,7 +124,11 @@ nobase_include_HEADERS +=			\
  vnet/ethernet/ethernet.h			\
  vnet/ethernet/packet.h				\
  vnet/ethernet/types.def			\
- vnet/ethernet/sfp.h
+ vnet/ethernet/sfp.h				\
+ vnet/ethernet/p2p_ethernet.api.h		\
+ vnet/ethernet/p2p_ethernet.h
+
+API_FILES += vnet/ethernet/p2p_ethernet.api
 
 ########################################
 # Layer 2 protocol: Ethernet bridging
@@ -245,6 +252,23 @@ nobase_include_HEADERS +=			\
 
 API_FILES += vnet/vxlan/vxlan.api
 
+########################################
+# Layer 2 / Geneve
+########################################
+libvnet_la_SOURCES +=				\
+  vnet/geneve/geneve.c				\
+  vnet/geneve/encap.c				\
+  vnet/geneve/decap.c				\
+  vnet/geneve/geneve_api.c
+
+nobase_include_HEADERS +=			\
+  vnet/geneve/geneve.h				\
+  vnet/geneve/geneve_packet.h			\
+  vnet/geneve/geneve_error.def			\
+  vnet/geneve/geneve.api.h
+
+API_FILES += vnet/geneve/geneve.api
+
 ########################################
 # Layer 2 / CDP
 ########################################
@@ -263,10 +287,15 @@ libvnet_la_SOURCES +=				\
   vnet/lldp/lldp_input.c			\
   vnet/lldp/lldp_node.c				\
   vnet/lldp/lldp_output.c			\
-  vnet/lldp/lldp_cli.c
+  vnet/lldp/lldp_cli.c                          \
+  vnet/lldp/lldp_api.c
 
 nobase_include_HEADERS +=			\
-  vnet/lldp/lldp_protocol.h
+  vnet/lldp/lldp_protocol.h                     \
+  vnet/lldp/lldp.h                              \
+  vnet/lldp/lldp.api.h
+
+API_FILES += vnet/lldp/lldp.api
 
 ########################################
 # Layer 2/3 "classify"
@@ -304,6 +333,7 @@ libvnet_la_SOURCES +=				\
  vnet/ip/ip46_cli.c				\
  vnet/ip/ip4_format.c				\
  vnet/ip/ip4_forward.c				\
+ vnet/ip/ip4_punt_drop.c			\
  vnet/ip/ip4_input.c				\
  vnet/ip/ip4_mtrie.c				\
  vnet/ip/ip4_pg.c				\
@@ -311,6 +341,7 @@ libvnet_la_SOURCES +=				\
  vnet/ip/ip4_source_check.c			\
  vnet/ip/ip6_format.c				\
  vnet/ip/ip6_forward.c				\
+ vnet/ip/ip6_punt_drop.c			\
  vnet/ip/ip6_hop_by_hop.c			\
  vnet/ip/ip6_input.c				\
  vnet/ip/ip6_neighbor.c				\
@@ -318,7 +349,7 @@ libvnet_la_SOURCES +=				\
  vnet/ip/ip_api.c				\
  vnet/ip/ip_checksum.c				\
  vnet/ip/ip_frag.c				\
- vnet/ip/ip.h					\
+ vnet/ip/ip.c					\
  vnet/ip/ip_init.c				\
  vnet/ip/ip_input_acl.c				\
  vnet/ip/lookup.c				\
@@ -386,6 +417,7 @@ libvnet_la_SOURCES +=				\
  vnet/ipsec/ipsec_if.c				\
  vnet/ipsec/ipsec_if_in.c			\
  vnet/ipsec/ipsec_if_out.c			\
+ vnet/ipsec/esp_format.c			\
  vnet/ipsec/esp_encrypt.c			\
  vnet/ipsec/esp_decrypt.c			\
  vnet/ipsec/ikev2.c				\
@@ -454,6 +486,7 @@ endif
 # Layer 4 protocol: tcp
 ########################################
 libvnet_la_SOURCES +=				\
+ vnet/tcp/tcp_api.c				\
  vnet/tcp/tcp_format.c				\
  vnet/tcp/tcp_pg.c				\
  vnet/tcp/tcp_syn_filter4.c			\
@@ -462,6 +495,8 @@ libvnet_la_SOURCES +=				\
  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
 
@@ -469,7 +504,10 @@ nobase_include_HEADERS +=			\
  vnet/tcp/tcp_packet.h				\
  vnet/tcp/tcp_timer.h				\
  vnet/tcp/tcp_debug.h				\
- vnet/tcp/tcp.h
+ vnet/tcp/tcp.h					\
+ vnet/tcp/tcp.api.h
+
+API_FILES += vnet/tcp/tcp.api
 
 ########################################
 # Layer 4 protocol: udp
@@ -820,20 +858,28 @@ nobase_include_HEADERS +=			\
 
 libvnet_la_SOURCES +=				\
   vnet/session/session.c			\
-  vnet/session/node.c				\
-  vnet/session/transport.c			\
+  vnet/session/session_table.c			\
+  vnet/session/session_lookup.c			\
+  vnet/session/session_node.c			\
+  vnet/session/transport_interface.c		\
   vnet/session/application.c			\
   vnet/session/session_cli.c			\
-  vnet/session/hashes.c				\
   vnet/session/application_interface.c		\
+  vnet/session/application_namespace.c		\
   vnet/session/segment_manager.c		\
+  vnet/session/session_test.c			\
   vnet/session/session_api.c
 
 nobase_include_HEADERS +=			\
   vnet/session/session.h			\
+  vnet/session/session_table.h			\
+  vnet/session/stream_session.h			\
+  vnet/session/session_lookup.h			\
   vnet/session/application.h			\
   vnet/session/transport.h			\
+  vnet/session/transport_interface.h		\
   vnet/session/application_interface.h		\
+  vnet/session/application_namespace.h		\
   vnet/session/session_debug.h			\
   vnet/session/segment_manager.h		\
   vnet/session/session.api.h
@@ -991,9 +1037,11 @@ libvnet_la_SOURCES +=				\
   vnet/dpo/lookup_dpo.c   			\
   vnet/dpo/classify_dpo.c   			\
   vnet/dpo/replicate_dpo.c   			\
-  vnet/dpo/interface_dpo.c   			\
+  vnet/dpo/interface_rx_dpo.c  			\
+  vnet/dpo/interface_tx_dpo.c  			\
   vnet/dpo/mpls_disposition.c   		\
-  vnet/dpo/mpls_label_dpo.c
+  vnet/dpo/mpls_label_dpo.c			\
+  vnet/dpo/l2_bridge_dpo.c
 
 nobase_include_HEADERS +=			\
   vnet/dpo/load_balance.h			\