dpdk: be a plugin

[vpp.git] / src / vnet.am

diff --git a/src/vnet.am b/src/vnet.am
index 70f1e7e..84930f0 100644 (file)
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -23,8 +23,7 @@ libvnet_la_DEPENDENCIES = \
        libvlibmemory.la        \
        libvlibmemoryclient.la
 
-libvnet_la_LIBADD = $(libvnet_la_DEPENDENCIES) -lm -lpthread -ldl -lrt $(DPDK_LD_ADD)
-libvnet_la_LDFLAGS = $(DPDK_LD_FLAGS)
+libvnet_la_LIBADD = $(libvnet_la_DEPENDENCIES) -lm -lpthread -ldl -lrt
 
 if WITH_LIBSSL
 libvnet_la_LIBADD += -lcrypto
@@ -324,11 +323,7 @@ libvnet_la_SOURCES +=                              \
  vnet/ip/ip_input_acl.c                                \
  vnet/ip/lookup.c                              \
  vnet/ip/ping.c                                        \
- vnet/ip/punt.c                                        \
- vnet/ip/udp_format.c                          \
- vnet/ip/udp_init.c                            \
- vnet/ip/udp_local.c                           \
- vnet/ip/udp_pg.c
+ vnet/ip/punt.c
 
 nobase_include_HEADERS +=                      \
  vnet/ip/format.h                              \
@@ -354,11 +349,7 @@ nobase_include_HEADERS +=                  \
  vnet/ip/ports.def                             \
  vnet/ip/protocols.def                         \
  vnet/ip/punt_error.def                                \
- vnet/ip/punt.h                                        \
- vnet/ip/tcp_packet.h                          \
- vnet/ip/udp_error.def                         \
- vnet/ip/udp.h                                 \
- vnet/ip/udp_packet.h
+ vnet/ip/punt.h
 
 API_FILES += vnet/ip/ip.api
 
@@ -404,15 +395,6 @@ libvnet_la_SOURCES +=                              \
  vnet/ipsec/ipsec_api.c
 
 API_FILES += vnet/ipsec/ipsec.api
-
-if WITH_DPDK
-libvnet_la_SOURCES +=                          \
- vnet/devices/dpdk/ipsec/esp_encrypt.c         \
- vnet/devices/dpdk/ipsec/esp_decrypt.c         \
- vnet/devices/dpdk/ipsec/crypto_node.c         \
- vnet/devices/dpdk/ipsec/cli.c                 \
- vnet/devices/dpdk/ipsec/ipsec.c
-endif
 endif
 
 libvnet_la_SOURCES +=                          \
@@ -424,11 +406,6 @@ nobase_include_HEADERS +=                  \
  vnet/ipsec/ikev2.h                            \
  vnet/ipsec/ikev2_priv.h                       \
  vnet/ipsec/ipsec.api.h
-if WITH_DPDK
-nobase_include_HEADERS +=                      \
- vnet/devices/dpdk/ipsec/ipsec.h               \
- vnet/devices/dpdk/ipsec/esp.h
-endif
 
 ########################################
 # Layer 3 protocol: osi
@@ -473,6 +450,38 @@ test_map_LDADD = libvnet.la libvppinfra.la libvlib.la      \
 test_map_LDFLAGS = -static
 endif
 
+########################################
+# Layer 4 protocol: tcp
+########################################
+libvnet_la_SOURCES +=                          \
+ vnet/tcp/tcp_format.c                         \
+ vnet/tcp/tcp_pg.c                             \
+ vnet/tcp/tcp_syn_filter4.c                    \
+ vnet/tcp/tcp_output.c                         \
+ vnet/tcp/tcp_input.c                          \
+ vnet/tcp/tcp_newreno.c                                \
+ vnet/tcp/tcp.c
+
+nobase_include_HEADERS +=                      \
+ vnet/tcp/tcp_packet.h                         \
+ vnet/tcp/tcp_timer.h                          \
+ vnet/tcp/tcp.h
+
+########################################
+# Layer 4 protocol: udp
+########################################
+libvnet_la_SOURCES +=                          \
+ vnet/udp/udp.c                                        \
+ vnet/udp/udp_input.c                          \
+ vnet/udp/builtin_server.c                     \
+ vnet/udp/udp_format.c                         \
+ vnet/udp/udp_local.c                          \
+ vnet/udp/udp_pg.c
+
+nobase_include_HEADERS +=                      \
+  vnet/udp/udp_error.def                               \
+  vnet/udp/udp.h                                       \
+  vnet/udp/udp_packet.h
 
 ########################################
 # Tunnel protocol: gre
@@ -674,7 +683,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
@@ -683,13 +692,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
@@ -709,17 +721,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
 ########################################
@@ -787,29 +788,7 @@ nobase_include_HEADERS +=                  \
   vnet/pg/pg.h                                 \
   vnet/pg/edit.h
 
-########################################
-# DPDK
-########################################
-if WITH_DPDK
-libvnet_la_SOURCES +=                          \
-  vnet/devices/dpdk/buffer.c                   \
-  vnet/devices/dpdk/dpdk_priv.h                \
-  vnet/devices/dpdk/device.c           \
-  vnet/devices/dpdk/format.c           \
-  vnet/devices/dpdk/init.c                     \
-  vnet/devices/dpdk/main.c                     \
-  vnet/devices/dpdk/node.c                     \
-  vnet/devices/dpdk/thread.c                   \
-  vnet/devices/dpdk/hqos.c                     \
-  vnet/devices/dpdk/cli.c                      \
-  vnet/devices/dpdk/dpdk_api.c
-
-nobase_include_HEADERS +=                      \
-  vnet/devices/dpdk/dpdk.h                     \
-  vnet/devices/dpdk/dpdk.api.h
-
-API_FILES += vnet/devices/dpdk/dpdk.api
-else
+if !WITH_DPDK
 libvnet_la_SOURCES +=                          \
   vnet/devices/nic/ixge.c                       \
   vnet/devices/nic/ixge.h                       \
@@ -841,6 +820,28 @@ libvnet_la_SOURCES +=                              \
 nobase_include_HEADERS +=                      \
   vnet/devices/ssvm/ssvm_eth.h
 
+########################################
+# session managmeent
+########################################
+
+libvnet_la_SOURCES +=                          \
+  vnet/session/session.c                       \
+  vnet/session/node.c                          \
+  vnet/session/transport.c                     \
+  vnet/session/application.c                   \
+  vnet/session/session_cli.c                   \
+  vnet/session/hashes.c                                \
+  vnet/session/application_interface.c         \
+  vnet/session/session_api.c
+
+nobase_include_HEADERS +=                      \
+  vnet/session/session.h                       \
+  vnet/session/application.h                   \
+  vnet/session/transport.h                     \
+  vnet/session/application_interface.h
+
+API_FILES += vnet/session/session.api
+
 ########################################
 # Linux packet interface
 ########################################