Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
acl-plugin: fix acl plugin test failing sporadically (VPP-898)
[vpp.git]
/
src
/
vnet.am
diff --git
a/src/vnet.am
b/src/vnet.am
index
25b8461
..
b5ce6d5
100644
(file)
--- a/
src/vnet.am
+++ b/
src/vnet.am
@@
-52,6
+52,8
@@
nobase_include_HEADERS += \
vnet/interface.h \
vnet/interface.api.h \
vnet/interface_funcs.h \
vnet/interface.h \
vnet/interface.api.h \
vnet/interface_funcs.h \
+ vnet/ip/ip4_to_ip6.h \
+ vnet/ip/ip6_to_ip4.h \
vnet/l3_types.h \
vnet/pipeline.h \
vnet/replication.h \
vnet/l3_types.h \
vnet/pipeline.h \
vnet/replication.h \
@@
-111,7
+113,9
@@
libvnet_la_SOURCES += \
vnet/ethernet/interface.c \
vnet/ethernet/node.c \
vnet/ethernet/pg.c \
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_api.c
nobase_include_HEADERS += \
vnet/ethernet/arp_packet.h \
nobase_include_HEADERS += \
vnet/ethernet/arp_packet.h \
@@
-119,7
+123,11
@@
nobase_include_HEADERS += \
vnet/ethernet/ethernet.h \
vnet/ethernet/packet.h \
vnet/ethernet/types.def \
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
########################################
# Layer 2 protocol: Ethernet bridging
@@
-460,6
+468,7
@@
libvnet_la_SOURCES += \
vnet/tcp/tcp_newreno.c \
vnet/tcp/builtin_client.c \
vnet/tcp/builtin_server.c \
vnet/tcp/tcp_newreno.c \
vnet/tcp/builtin_client.c \
vnet/tcp/builtin_server.c \
+ vnet/tcp/builtin_http_server.c \
vnet/tcp/tcp_test.c \
vnet/tcp/tcp.c
vnet/tcp/tcp_test.c \
vnet/tcp/tcp.c
@@
-662,19
+671,6
@@
nobase_include_HEADERS += \
API_FILES += vnet/lisp-gpe/lisp_gpe.api
API_FILES += vnet/lisp-gpe/lisp_gpe.api
-if ENABLE_TESTS
-TESTS += test_test
-
-test_test_SOURCES = tests/vnet/lisp-gpe/test.c
-
-test_test_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-
-test_test_LDADD = $(LIBOBJS)
-
-noinst_PROGRAMS += $(TESTS)
-check_PROGRAMS += $(TESTS)
-endif
-
########################################
# DHCP client
########################################
########################################
# DHCP client
########################################
@@
-708,21
+704,31
@@
nobase_include_HEADERS += \
# ipv6 segment routing
########################################
# ipv6 segment routing
########################################
-if WITH_LIBSSL
libvnet_la_SOURCES += \
libvnet_la_SOURCES += \
- vnet/sr/sr.c \
- vnet/sr/sr_localsid.c \
- vnet/sr/sr_policy_rewrite.c \
- vnet/sr/sr_steering.c \
- vnet/sr/sr_api.c
-endif
+ vnet/srv6/sr.c \
+ vnet/srv6/sr_localsid.c \
+ vnet/srv6/sr_policy_rewrite.c \
+ vnet/srv6/sr_steering.c \
+ vnet/srv6/sr_api.c
nobase_include_HEADERS += \
nobase_include_HEADERS += \
- vnet/sr/sr_packet.h \
- vnet/sr/sr.h \
- vnet/sr/sr.api.h
+ vnet/srv6/sr_packet.h \
+ vnet/srv6/sr.h \
+ vnet/srv6/sr.api.h
+
+API_FILES += vnet/srv6/sr.api
+
+########################################
+# mpls segment routing
+########################################
-API_FILES += vnet/sr/sr.api
+libvnet_la_SOURCES += \
+ vnet/srmpls/sr_mpls_policy.c \
+ vnet/srmpls/sr_mpls_steering.c
+
+
+nobase_include_HEADERS += \
+ vnet/srmpls/sr.h
########################################
# IPFIX / netflow v10
########################################
# IPFIX / netflow v10