AUTOMAKE_OPTIONS = foreign subdir-objects
-AM_CFLAGS = -Wall @DPDK@ @VIRL@ @IPSEC@ @VCGN@ @IPV6SR@
+AM_CFLAGS = -Wall @DPDK@ @IPSEC@ @IPV6SR@
libvnet_la_SOURCES =
libvnetplugin_la_SOURCES =
noinst_PROGRAMS =
TESTS =
+dpdk_libs =
+if WITH_DPDK
+dpdk_libs += -l:libdpdk.a
+endif
+
########################################
# Generic stuff
########################################
libvnet_la_SOURCES += \
vnet/config.c \
+ vnet/handoff.c \
vnet/interface.c \
vnet/interface_cli.c \
vnet/interface_format.c \
vnet/buffer.h \
vnet/config.h \
vnet/global_funcs.h \
+ vnet/handoff.h \
vnet/interface.h \
vnet/interface_funcs.h \
vnet/l3_types.h \
nobase_include_HEADERS += \
vnet/policer/police.h \
+ vnet/policer/policer.h \
+ vnet/policer/fix_types.h \
vnet/policer/xlate.h
########################################
vnet/l2/feat_bitmap.c \
vnet/l2/l2_bd.c \
vnet/l2/l2_bvi.c \
- vnet/l2/l2_classify.c \
+ vnet/l2/l2_input_classify.c \
+ vnet/l2/l2_output_classify.c \
vnet/l2/l2_efp_filter.c \
vnet/l2/l2_fib.c \
vnet/l2/l2_flood.c \
vnet/classify/vnet_classify.c \
vnet/classify/ip_classify.c \
vnet/classify/input_acl.c \
+ vnet/classify/policer_classify.c \
vnet/classify/vnet_classify.h
nobase_include_HEADERS += \
vnet/classify/vnet_classify.h \
- vnet/classify/input_acl.h
+ vnet/classify/input_acl.h \
+ vnet/classify/policer_classify.h
########################################
# Layer 3 protocols go here
vnet/ip/format.c \
vnet/ip/icmp4.c \
vnet/ip/icmp6.c \
+ vnet/ip/ip_feature_registration.c \
vnet/ip/ip46_cli.c \
vnet/ip/ip4_format.c \
vnet/ip/ip4_forward.c \
- vnet/ip/ip4_hop_by_hop.c \
vnet/ip/ip4_input.c \
vnet/ip/ip4_mtrie.c \
vnet/ip/ip4_pg.c \
vnet/ip/ip4_source_check.c \
+ vnet/ip/ip4_source_and_port_range_check.c \
vnet/ip/ip6_format.c \
vnet/ip/ip6_forward.c \
vnet/ip/ip6_hop_by_hop.c \
vnet/ip/icmp6.h \
vnet/ip/igmp_packet.h \
vnet/ip/ip.h \
+ vnet/ip/ip_feature_registration.h \
+ vnet/ip/ip_source_and_port_range_check.h \
vnet/ip/ip4.h \
vnet/ip/ip4_mtrie.h \
vnet/ip/ip4_error.h \
vnet/map/map.c \
vnet/map/ip4_map.c \
vnet/map/ip6_map.c \
- vnet/map/sixrd.c \
- vnet/map/ip4_sixrd.c \
- vnet/map/ip6_sixrd.c \
vnet/map/ip4_map_t.c \
vnet/map/ip6_map_t.c
nobase_include_HEADERS += \
- vnet/map/map.h \
- vnet/map/sixrd.h
+ vnet/map/map.h
+
+if ENABLE_TESTS
+TESTS += test_map
+test_map_SOURCES = \
+ vnet/map/test.c
+test_map_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
+
+test_map_LDADD = libvnet.la -lvppinfra -lvlib \
+ -lpthread -lvlibmemory -lvlibapi -lvlib_unix \
+ -ldl -lsvm -lrt
+
+test_map_LDFLAGS = -static
+endif
+
########################################
# Tunnel protocol: gre
########################################
-# NSH Map: nsh
-########################################
-
-nobase_include_HEADERS += \
- vnet/nsh/nsh_packet.h \
- vnet/nsh/nsh_error.def
-
-
-########################################
-# Tunnel protocol: nsh-gre
+# Tunnel protocol: vxlan-gpe
########################################
libvnet_la_SOURCES += \
- vnet/nsh-gre/nsh_gre.c \
- vnet/nsh-gre/encap.c \
- vnet/nsh-gre/decap.c
+ vnet/vxlan-gpe/vxlan_gpe.c \
+ vnet/vxlan-gpe/encap.c \
+ vnet/vxlan-gpe/decap.c
nobase_include_HEADERS += \
- vnet/nsh-gre/nsh_gre.h
+ vnet/vxlan-gpe/vxlan_gpe.h \
+ vnet/vxlan-gpe/vxlan_gpe_packet.h \
+ vnet/vxlan-gpe/vxlan_gpe_error.def
########################################
-# Tunnel protocol: nsh-vxlan-gpe
+# Tunnel protocol: ipsec+gre
########################################
-
libvnet_la_SOURCES += \
- vnet/nsh-vxlan-gpe/nsh_vxlan_gpe.c \
- vnet/nsh-vxlan-gpe/encap.c \
- vnet/nsh-vxlan-gpe/decap.c
+ vnet/ipsec-gre/ipsec_gre.c \
+ vnet/ipsec-gre/node.c \
+ vnet/ipsec-gre/interface.c
nobase_include_HEADERS += \
- vnet/nsh-vxlan-gpe/nsh_vxlan_gpe.h \
- vnet/nsh-vxlan-gpe/vxlan_gpe_packet.h \
- vnet/nsh-vxlan-gpe/nsh_vxlan_gpe_error.def
+ vnet/ipsec-gre/ipsec_gre.h \
+ vnet/ipsec-gre/error.def
########################################
# LISP control plane: lisp-cp
if ENABLE_TESTS
-LDS = -lvppinfra -l:libvlib.a -l:libdpdk.a -l:libvlibmemory.a \
+LDS = -lvppinfra -l:libvlib.a $(dpdk_libs) -l:libvlibmemory.a \
-l:libvlibapi.a -l:libsvm.a -lpthread -ldl -lrt -lm -l:libvlib_unix.a
TESTS += test_cp_serdes test_lisp_types
vnet/sr/sr_error.def \
vnet/sr/sr.h
-########################################
-# CGN
-#########################################
-
-if WITH_VCGN
-libvnet_la_SOURCES += \
- vnet/vcgn/cnat_bulk_port.c \
- vnet/vcgn/cnat_config.c \
- vnet/vcgn/cnat_db_scanner.c \
- vnet/vcgn/cnat_db_v2.c \
- vnet/vcgn/cnat_debug_msg_handler.c \
- vnet/vcgn/cnat_cli_handler.c \
- vnet/vcgn/cnat_global.c \
- vnet/vcgn/cnat_ipv4_udp_inside_input.c \
- vnet/vcgn/cnat_ipv4_udp_inside_input_exceptions.c \
- vnet/vcgn/cnat_ipv4_udp_outside_input.c \
- vnet/vcgn/cnat_ipv4_tcp_inside_input.c \
- vnet/vcgn/cnat_ipv4_tcp_inside_input_exceptions.c \
- vnet/vcgn/cnat_ipv4_tcp_outside_input.c \
- vnet/vcgn/cnat_ipv4_icmp_query_inside_input.c \
- vnet/vcgn/cnat_ipv4_icmp_query_inside_input_exception.c \
- vnet/vcgn/cnat_ipv4_icmp_query_outside_input.c \
- vnet/vcgn/cnat_ipv4_icmp_error_inside_input.c \
- vnet/vcgn/cnat_ipv4_icmp_error_outside_input.c \
- vnet/vcgn/cnat_logging.c \
- vnet/vcgn/cnat_ports.c \
- vnet/vcgn/cnat_util.c \
- vnet/vcgn/cnat_show.c \
- vnet/vcgn/cnat_syslog.c \
- vnet/vcgn/cnat_v4_functions.c \
- vnet/vcgn/index_list.c \
- vnet/vcgn/spp_platform_trace_log.c \
- vnet/vcgn/vcgn_classify.c
-endif
-
########################################
# DHCPv6 proxy
########################################
vnet/flow/ipfix_packet.h
########################################
-# IPFIX sample code
+# IPFIX classify code
########################################
libvnet_la_SOURCES += \
- vnet/flow/flow_report_sample.c
+ vnet/flow/flow_report_classify.c
nobase_include_HEADERS += \
- vnet/flow/flow_report_sample.h
+ vnet/flow/flow_report_classify.h
########################################
# lawful intercept
vnet/devices/dpdk/format.c \
vnet/devices/dpdk/init.c \
vnet/devices/dpdk/node.c \
- vnet/devices/dpdk/threads.c \
vnet/devices/dpdk/vhost_user.c \
vnet/devices/dpdk/cli.c
nobase_include_HEADERS += \
- vnet/devices/dpdk/dpdk.h \
- vnet/devices/dpdk/threads.h
+ vnet/devices/dpdk/dpdk.h
+else
+libvnet_la_SOURCES += \
+ vnet/devices/nic/ixge.c \
+ vnet/devices/nic/ixge.h \
+ vnet/devices/nic/sfp.c \
+ vnet/devices/nic/sfp.h
endif
########################################
# virtio
########################################
-if WITH_DPDK
libvnet_la_SOURCES += \
vnet/devices/virtio/vhost-user.c
nobase_include_HEADERS += \
vnet/devices/virtio/vhost-user.h
-endif WITH_DPDK
########################################
# ssvm ethernet
nobase_include_HEADERS += \
vnet/plugin/plugin.h
-########################################
-# Service Chain verification util
-########################################
-libvnet_la_SOURCES += \
- vnet/lib-scv/scv_util.c
-
-nobase_include_HEADERS += \
- vnet/lib-scv/scv_util.h \
- vnet/lib-scv/math64.h
-
lib_LTLIBRARIES = libvnet.la libvnetplugin.la
-dpdk_libs =
-
-if WITH_DPDK
-dpdk_libs += -l:libdpdk.a
-endif
-
pcap2pg_SOURCES = \
vnet/unix/pcap2pg.c \
vnet/unix/pcap.h
pcap2pg_LDADD = libvnet.la -l:libvppinfra.a -lpthread -lm -ldl
noinst_PROGRAMS += pcap2pg
-
-