Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
session: first approximation implementation of tls
[vpp.git]
/
src
/
vnet.am
diff --git
a/src/vnet.am
b/src/vnet.am
index
8f88474
..
c787eb3
100644
(file)
--- a/
src/vnet.am
+++ b/
src/vnet.am
@@
-27,6
+27,10
@@
if WITH_LIBSSL
libvnet_la_LIBADD += -lcrypto
endif
libvnet_la_LIBADD += -lcrypto
endif
+if WITH_MBEDTLS
+libvnet_la_LIBADD += -lmbedtls -lmbedx509 -lmbedcrypto
+endif
+
########################################
# Generic stuff
########################################
########################################
# Generic stuff
########################################
@@
-148,12
+152,11
@@
libvnet_la_SOURCES += \
vnet/l2/l2_fib.c \
vnet/l2/l2_flood.c \
vnet/l2/l2_fwd.c \
vnet/l2/l2_fib.c \
vnet/l2/l2_flood.c \
vnet/l2/l2_fwd.c \
- vnet/l2/l2_input_acl.c \
vnet/l2/l2_input.c \
vnet/l2/l2_input_vtr.c \
vnet/l2/l2_learn.c \
vnet/l2/l2_input.c \
vnet/l2/l2_input_vtr.c \
vnet/l2/l2_learn.c \
- vnet/l2/l2_output_acl.c \
vnet/l2/l2_output.c \
vnet/l2/l2_output.c \
+ vnet/l2/l2_in_out_acl.c \
vnet/l2/l2_patch.c \
vnet/l2/l2_rw.c \
vnet/l2/l2_vtr.c \
vnet/l2/l2_patch.c \
vnet/l2/l2_rw.c \
vnet/l2/l2_vtr.c \
@@
-307,7
+310,7
@@
API_FILES += vnet/lldp/lldp.api
libvnet_la_SOURCES += \
vnet/classify/vnet_classify.c \
vnet/classify/ip_classify.c \
libvnet_la_SOURCES += \
vnet/classify/vnet_classify.c \
vnet/classify/ip_classify.c \
- vnet/classify/in
put_acl.c
\
+ vnet/classify/in
_out_acl.c
\
vnet/classify/policer_classify.c \
vnet/classify/flow_classify.c \
vnet/classify/flow_classify_node.c \
vnet/classify/policer_classify.c \
vnet/classify/flow_classify.c \
vnet/classify/flow_classify_node.c \
@@
-316,7
+319,7
@@
libvnet_la_SOURCES += \
nobase_include_HEADERS += \
vnet/classify/vnet_classify.h \
nobase_include_HEADERS += \
vnet/classify/vnet_classify.h \
- vnet/classify/in
p
ut_acl.h \
+ vnet/classify/in
_o
ut_acl.h \
vnet/classify/policer_classify.h \
vnet/classify/flow_classify.h \
vnet/classify/classify.api.h
vnet/classify/policer_classify.h \
vnet/classify/flow_classify.h \
vnet/classify/classify.api.h
@@
-357,7
+360,7
@@
libvnet_la_SOURCES += \
vnet/ip/ip_frag.c \
vnet/ip/ip.c \
vnet/ip/ip_init.c \
vnet/ip/ip_frag.c \
vnet/ip/ip.c \
vnet/ip/ip_init.c \
- vnet/ip/ip_in
put_acl.c
\
+ vnet/ip/ip_in
_out_acl.c
\
vnet/ip/lookup.c \
vnet/ip/ping.c \
vnet/ip/punt_api.c \
vnet/ip/lookup.c \
vnet/ip/ping.c \
vnet/ip/punt_api.c \
@@
-543,6
+546,7
@@
API_FILES += vnet/udp/udp.api
# Layer 4 protocol: sctp
########################################
libvnet_la_SOURCES += \
# Layer 4 protocol: sctp
########################################
libvnet_la_SOURCES += \
+ vnet/sctp/sctp_api.c \
vnet/sctp/sctp.c \
vnet/sctp/sctp_pg.c \
vnet/sctp/sctp_input.c \
vnet/sctp/sctp.c \
vnet/sctp/sctp_pg.c \
vnet/sctp/sctp_input.c \
@@
-553,7
+557,10
@@
nobase_include_HEADERS += \
vnet/sctp/sctp_error.def \
vnet/sctp/sctp_packet.h \
vnet/sctp/sctp_timer.h \
vnet/sctp/sctp_error.def \
vnet/sctp/sctp_packet.h \
vnet/sctp/sctp_timer.h \
- vnet/sctp/sctp.h
+ vnet/sctp/sctp.h \
+ vnet/sctp/sctp.api.h
+
+API_FILES += vnet/sctp/sctp.api
########################################
# Tunnel protocol: gre
########################################
# Tunnel protocol: gre
@@
-967,6
+974,10
@@
libvnet_la_SOURCES += \
vnet/session-apps/http_server.c \
vnet/session-apps/proxy.c
vnet/session-apps/http_server.c \
vnet/session-apps/proxy.c
+if WITH_MBEDTLS
+libvnet_la_SOURCES += vnet/session-apps/tls.c
+endif
+
nobase_include_HEADERS += \
vnet/session-apps/echo_client.h \
vnet/session-apps/proxy.h
nobase_include_HEADERS += \
vnet/session-apps/echo_client.h \
vnet/session-apps/proxy.h
@@
-1237,6
+1248,13
@@
pcap2pg_SOURCES = \
pcap2pg_LDFLAGS = -static
pcap2pg_LDADD = libvnet.la libvppinfra.la -lpthread libvlibmemory.la -lm -ldl
pcap2pg_LDFLAGS = -static
pcap2pg_LDADD = libvnet.la libvppinfra.la -lpthread libvlibmemory.la -lm -ldl
-noinst_PROGRAMS += pcap2pg
+pcap2cinit_SOURCES = \
+ vnet/unix/pcap2cinit.c \
+ vnet/unix/pcap.h
+
+pcap2cinit_LDFLAGS = -static
+pcap2cinit_LDADD = libvnet.la libvppinfra.la -lpthread libvlibmemory.la -lm -ldl
+
+noinst_PROGRAMS += pcap2pg pcap2cinit
# vi:syntax=automake
# vi:syntax=automake