summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
597d3c4)
This replaces --without-ipsec and --without-ipv6sr
and allows other parts of the code to be disabled if
libssl is not available.
Change-Id: Id97ff3685a7924d7f86622952e0405d94ceb5957
Signed-off-by: Damjan Marion <damarion@cisco.com>
jvpp gmod
vlib_configure_args_arm32 = --with-pre-data=128
jvpp gmod
vlib_configure_args_arm32 = --with-pre-data=128
-vnet_configure_args_arm32 = --with-dpdk --without-ipsec --without-ipv6sr
-vpp_configure_args_arm32 = --with-dpdk --without-ipsec --without-ipv6sr
+vnet_configure_args_arm32 = --with-dpdk --without-libssl
+vpp_configure_args_arm32 = --with-dpdk --without-libssl
arm32_dpdk_arch = "armv7a"
arm32_dpdk_target = "arm-armv7a-linuxapp-gcc"
arm32_dpdk_arch = "armv7a"
arm32_dpdk_target = "arm-armv7a-linuxapp-gcc"
-vpp_configure_args_dpaa2 = --with-dpdk --without-ipsec \
- --without-ipv6sr --with-sysroot=$(SYSROOT)
-vnet_configure_args_dpaa2 = --with-dpdk --without-ipsec \
- --without-ipv6sr --with-sysroot=$(SYSROOT)
+vpp_configure_args_dpaa2 = --with-dpdk --without-libssl \
+ --with-sysroot=$(SYSROOT)
+vnet_configure_args_dpaa2 = --with-dpdk --without-libssl \
+ --with-sysroot=$(SYSROOT)
# Set these parameters carefully. The vlib_buffer_t is 256 bytes, i.e.
vlib_configure_args_dpaa2 = --with-pre-data=256
# Set these parameters carefully. The vlib_buffer_t is 256 bytes, i.e.
vlib_configure_args_dpaa2 = --with-pre-data=256
vpp vpp-api-test
vnet_configure_args_qppc = \
vpp vpp-api-test
vnet_configure_args_qppc = \
- --without-ipsec --without-ipv6sr
vpp_configure_args_qppc = \
vpp_configure_args_qppc = \
- --without-ipsec --without-ipv6sr
vlib_configure_args_qppc = --with-pre-data=128
vlib_configure_args_qppc = --with-pre-data=128
vpp-cavium-dpdk vpp-api-test-cavium-dpdk
vnet-cavium-dpdk_configure_args_thunder = \
vpp-cavium-dpdk vpp-api-test-cavium-dpdk
vnet-cavium-dpdk_configure_args_thunder = \
- --with-dpdk --without-ipsec --without-ipv6sr
+ --with-dpdk --without-libssl
vpp-cavium-dpdk_configure_args_thunder = \
vpp-cavium-dpdk_configure_args_thunder = \
- --with-dpdk --without-ipsec --without-ipv6sr
+ --with-dpdk --without-libssl
cavium-dpdk_configure_args_thunder = --with-headroom=256
cavium-dpdk_configure_args_thunder = --with-headroom=256
WITH_ARG(dpdk_mlx5_pmd, [Use DPDK with mlx5 PMD])
# --without-X
WITH_ARG(dpdk_mlx5_pmd, [Use DPDK with mlx5 PMD])
# --without-X
-WITHOUT_ARG(ipsec, [Disable IPSec])
-WITHOUT_ARG(ipv6sr, [Disable IPv6 SR])
+WITHOUT_ARG(libssl, [Disable libssl])
WITHOUT_ARG(apicli, [Disable binary api CLI])
AC_ARG_WITH(unix,
WITHOUT_ARG(apicli, [Disable binary api CLI])
AC_ARG_WITH(unix,
AC_DEFINE_UNQUOTED(DPDK, [${n_with_dpdk}])
AC_DEFINE_UNQUOTED(DPDK_SHARED_LIB, [${n_enable_dpdk_shared}])
AC_DEFINE_UNQUOTED(DPDK_CRYPTO, [${n_with_dpdk_crypto}])
AC_DEFINE_UNQUOTED(DPDK, [${n_with_dpdk}])
AC_DEFINE_UNQUOTED(DPDK_SHARED_LIB, [${n_enable_dpdk_shared}])
AC_DEFINE_UNQUOTED(DPDK_CRYPTO, [${n_with_dpdk_crypto}])
-AC_DEFINE_UNQUOTED(IPSEC, [${n_with_ipsec}])
-AC_DEFINE_UNQUOTED(IPV6SR, [${n_with_ipv6sr}])
+AC_DEFINE_UNQUOTED(WITH_LIBSSL, [${n_with_libssl}])
# Silence following noise:
# Silence following noise:
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 $(DPDK_LD_ADD)
libvnet_la_LDFLAGS = $(DPDK_LD_FLAGS)
libvnet_la_LIBADD += -lcrypto
endif
libvnet_la_LIBADD += -lcrypto
endif
########################################
# Layer 3 protocol: IPSec
########################################
########################################
# Layer 3 protocol: IPSec
########################################
libvnet_la_SOURCES += \
vnet/ipsec/ipsec.c \
vnet/ipsec/ipsec_cli.c \
libvnet_la_SOURCES += \
vnet/ipsec/ipsec.c \
vnet/ipsec/ipsec_cli.c \
# ipv6 segment routing
########################################
# ipv6 segment routing
########################################
libvnet_la_SOURCES += \
vnet/sr/sr.c \
vnet/sr/sr_replicate.c \
libvnet_la_SOURCES += \
vnet/sr/sr.c \
vnet/sr/sr_replicate.c \
#include <vnet/vnet_msg_enum.h>
#include <vnet/vnet_msg_enum.h>
#include <vnet/ipsec/ipsec.h>
#include <vnet/ipsec/ikev2.h>
#endif /* IPSEC */
#include <vnet/ipsec/ipsec.h>
#include <vnet/ipsec/ikev2.h>
#endif /* IPSEC */
static void vl_api_ipsec_spd_add_del_t_handler
(vl_api_ipsec_spd_add_del_t * mp)
{
static void vl_api_ipsec_spd_add_del_t_handler
(vl_api_ipsec_spd_add_del_t * mp)
{
clib_warning ("unimplemented");
#else
clib_warning ("unimplemented");
#else
VALIDATE_SW_IF_INDEX (mp);
VALIDATE_SW_IF_INDEX (mp);
rv = ipsec_set_interface_spd (vm, sw_if_index, spd_id, mp->is_add);
#else
rv = VNET_API_ERROR_UNIMPLEMENTED;
rv = ipsec_set_interface_spd (vm, sw_if_index, spd_id, mp->is_add);
#else
rv = VNET_API_ERROR_UNIMPLEMENTED;
vl_api_ipsec_spd_add_del_entry_reply_t *rmp;
int rv;
vl_api_ipsec_spd_add_del_entry_reply_t *rmp;
int rv;
ipsec_policy_t p;
memset (&p, 0, sizeof (p));
ipsec_policy_t p;
memset (&p, 0, sizeof (p));
vlib_main_t *vm __attribute__ ((unused)) = vlib_get_main ();
vl_api_ipsec_sad_add_del_entry_reply_t *rmp;
int rv;
vlib_main_t *vm __attribute__ ((unused)) = vlib_get_main ();
vl_api_ipsec_sad_add_del_entry_reply_t *rmp;
int rv;
ipsec_sa_t sa;
memset (&sa, 0, sizeof (sa));
ipsec_sa_t sa;
memset (&sa, 0, sizeof (sa));
ipsec_spd_t *spd;
uword *p;
u32 spd_index;
ipsec_spd_t *spd;
uword *p;
u32 spd_index;
q = vl_api_client_index_to_input_queue (mp->client_index);
if (q == 0)
return;
q = vl_api_client_index_to_input_queue (mp->client_index);
if (q == 0)
return;
vlib_main_t *vm __attribute__ ((unused)) = vlib_get_main ();
vl_api_ipsec_sa_set_key_reply_t *rmp;
int rv;
vlib_main_t *vm __attribute__ ((unused)) = vlib_get_main ();
vl_api_ipsec_sa_set_key_reply_t *rmp;
int rv;
ipsec_sa_t sa;
sa.id = ntohl (mp->sa_id);
sa.crypto_key_len = mp->crypto_key_length;
ipsec_sa_t sa;
sa.id = ntohl (mp->sa_id);
sa.crypto_key_len = mp->crypto_key_length;
vl_api_ikev2_profile_add_del_reply_t *rmp;
int rv = 0;
vl_api_ikev2_profile_add_del_reply_t *rmp;
int rv = 0;
vlib_main_t *vm = vlib_get_main ();
clib_error_t *error;
u8 *tmp = format (0, "%s", mp->name);
vlib_main_t *vm = vlib_get_main ();
clib_error_t *error;
u8 *tmp = format (0, "%s", mp->name);
vl_api_ikev2_profile_set_auth_reply_t *rmp;
int rv = 0;
vl_api_ikev2_profile_set_auth_reply_t *rmp;
int rv = 0;
vlib_main_t *vm = vlib_get_main ();
clib_error_t *error;
u8 *tmp = format (0, "%s", mp->name);
vlib_main_t *vm = vlib_get_main ();
clib_error_t *error;
u8 *tmp = format (0, "%s", mp->name);
vl_api_ikev2_profile_add_del_reply_t *rmp;
int rv = 0;
vl_api_ikev2_profile_add_del_reply_t *rmp;
int rv = 0;
vlib_main_t *vm = vlib_get_main ();
clib_error_t *error;
u8 *tmp = format (0, "%s", mp->name);
vlib_main_t *vm = vlib_get_main ();
clib_error_t *error;
u8 *tmp = format (0, "%s", mp->name);
vl_api_ikev2_profile_set_ts_reply_t *rmp;
int rv = 0;
vl_api_ikev2_profile_set_ts_reply_t *rmp;
int rv = 0;
vlib_main_t *vm = vlib_get_main ();
clib_error_t *error;
u8 *tmp = format (0, "%s", mp->name);
vlib_main_t *vm = vlib_get_main ();
clib_error_t *error;
u8 *tmp = format (0, "%s", mp->name);
vl_api_ikev2_profile_set_ts_reply_t *rmp;
int rv = 0;
vl_api_ikev2_profile_set_ts_reply_t *rmp;
int rv = 0;
vlib_main_t *vm = vlib_get_main ();
clib_error_t *error;
vlib_main_t *vm = vlib_get_main ();
clib_error_t *error;
#define ESP_NODE "esp-encrypt"
#endif
#define ESP_NODE "esp-encrypt"
#endif
#define foreach_ipsec_output_next \
_(DROP, "error-drop") \
#define foreach_ipsec_output_next \
_(DROP, "error-drop") \
#include <vnet/ip/ip6_neighbor.h>
#include <vnet/dhcp/proxy.h>
#include <vnet/dhcp/client.h>
#include <vnet/ip/ip6_neighbor.h>
#include <vnet/dhcp/proxy.h>
#include <vnet/dhcp/client.h>
#include <vnet/sr/sr.h>
#endif
#include <vnet/dhcpv6/proxy.h>
#include <vnet/sr/sr.h>
#endif
#include <vnet/dhcpv6/proxy.h>