Consolidate DHCP v4 and V6 implementation. No functional change intended

[vpp.git] / src / vnet.am

diff --git a/src/vnet.am b/src/vnet.am
index 28a1b19..64484e1 100644 (file)
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -62,7 +62,8 @@ nobase_include_HEADERS +=                     \
   vnet/rewrite.h                               \
   vnet/vnet.h                                  \
   vnet/vnet_all_api_h.h                                \
-  vnet/vnet_msg_enum.h
+  vnet/vnet_msg_enum.h                         \
+  vnet/util/radix.h
 
 API_FILES += vnet/interface.api
 
@@ -73,12 +74,16 @@ API_FILES += vnet/interface.api
 libvnet_la_SOURCES +=                          \
   vnet/policer/node_funcs.c                    \
   vnet/policer/policer.c                       \
-  vnet/policer/xlate.c
+  vnet/policer/xlate.c                         \
+  vnet/policer/policer_api.c
 
 nobase_include_HEADERS +=                      \
   vnet/policer/police.h                                \
   vnet/policer/policer.h                       \
-  vnet/policer/xlate.h
+  vnet/policer/xlate.h                         \
+  vnet/policer/policer.api.h
+
+API_FILES += vnet/policer/policer.api
 
 ########################################
 # Cop - junk filter
@@ -400,7 +405,7 @@ libvnet_la_SOURCES +=                               \
 
 API_FILES += vnet/ipsec/ipsec.api
 
-if WITH_DPDK_CRYPTO
+if WITH_DPDK
 libvnet_la_SOURCES +=                          \
  vnet/devices/dpdk/ipsec/esp_encrypt.c         \
  vnet/devices/dpdk/ipsec/esp_decrypt.c         \
@@ -419,7 +424,7 @@ nobase_include_HEADERS +=                   \
  vnet/ipsec/ikev2.h                            \
  vnet/ipsec/ikev2_priv.h                       \
  vnet/ipsec/ipsec.api.h
-if WITH_DPDK_CRYPTO
+if WITH_DPDK
 nobase_include_HEADERS +=                      \
  vnet/devices/dpdk/ipsec/ipsec.h               \
  vnet/devices/dpdk/ipsec/esp.h
@@ -573,7 +578,9 @@ libvnet_la_SOURCES +=                               \
  vnet/lisp-cp/gid_dictionary.c                 \
  vnet/lisp-cp/lisp_msg_serdes.c                        \
  vnet/lisp-cp/packets.c                                \
+ vnet/lisp-cp/one_cli.c                                \
  vnet/lisp-cp/lisp_cli.c                       \
+ vnet/lisp-cp/one_api.c                                \
  vnet/lisp-cp/lisp_api.c
 
 nobase_include_HEADERS +=                      \
@@ -583,9 +590,11 @@ nobase_include_HEADERS +=                  \
  vnet/lisp-cp/lisp_cp_messages.h               \
  vnet/lisp-cp/lisp_msg_serdes.h                        \
  vnet/lisp-cp/control.h                                \
+ vnet/lisp-cp/one.api.h                                \
  vnet/lisp-cp/lisp.api.h
 
 API_FILES += vnet/lisp-cp/lisp.api
+API_FILES += vnet/lisp-cp/one.api
 
 if ENABLE_TESTS
 LDS = \
@@ -665,7 +674,7 @@ libvnet_la_SOURCES +=                               \
  vnet/dhcp/dhcp_api.c
 
 nobase_include_HEADERS +=                      \
- vnet/dhcp/client.h                                    \
+ vnet/dhcp/client.h                            \
  vnet/dhcp/dhcp.api.h
 
 API_FILES += vnet/dhcp/dhcp.api
@@ -674,13 +683,16 @@ API_FILES += vnet/dhcp/dhcp.api
 # DHCP proxy
 ########################################
 libvnet_la_SOURCES +=                          \
- vnet/dhcp/proxy_node.c                                \
- vnet/dhcp/proxy.h
+ vnet/dhcp/dhcp6_proxy_node.c                   \
+ vnet/dhcp/dhcp4_proxy_node.c                  \
+ vnet/dhcp/dhcp_proxy.c
 
 nobase_include_HEADERS +=                      \
- vnet/dhcp/packet.h                            \
- vnet/dhcp/proxy.h                             \
- vnet/dhcp/proxy_error.def
+ vnet/dhcp/dhcp4_packet.h                      \
+ vnet/dhcp/dhcp6_packet.h                      \
+ vnet/dhcp/dhcp_proxy.h                                \
+ vnet/dhcp/dhcp6_proxy_error.def                \
+ vnet/dhcp/dhcp4_proxy_error.def
 
 ########################################
 # ipv6 segment routing
@@ -689,7 +701,6 @@ nobase_include_HEADERS +=                   \
 if WITH_LIBSSL
 libvnet_la_SOURCES +=                          \
  vnet/sr/sr.c                                  \
- vnet/sr/sr_replicate.c                                \
  vnet/sr/sr_api.c
 endif
 
@@ -701,17 +712,6 @@ nobase_include_HEADERS +=                  \
 
 API_FILES += vnet/sr/sr.api
 
-########################################
-# DHCPv6 proxy
-########################################
-libvnet_la_SOURCES +=                          \
- vnet/dhcpv6/proxy_node.c
-
-nobase_include_HEADERS +=                      \
- vnet/dhcpv6/packet.h                          \
- vnet/dhcpv6/proxy.h                           \
- vnet/dhcpv6/proxy_error.def
-
 ########################################
 # IPFIX / netflow v10
 ########################################
@@ -954,12 +954,14 @@ libvnet_la_SOURCES +=                             \
   vnet/adj/adj_midchain.c                      \
   vnet/adj/adj_mcast.c                         \
   vnet/adj/adj_l2.c                            \
+  vnet/adj/adj_nsh.c                           \
   vnet/adj/adj.c
 
 nobase_include_HEADERS +=                      \
   vnet/adj/adj.h                               \
   vnet/adj/adj_types.h                         \
   vnet/adj/adj_glean.h                         \
+  vnet/adj/adj_nsh.h                           \
   vnet/adj/adj_nbr.h
 
 ########################################