Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ipsec: add udp-encap option to debug cli commands
[vpp.git]
/
src
/
vnet
/
ipsec
/
ipsec_api.c
diff --git
a/src/vnet/ipsec/ipsec_api.c
b/src/vnet/ipsec/ipsec_api.c
index
5fbf86b
..
c4284b9
100644
(file)
--- a/
src/vnet/ipsec/ipsec_api.c
+++ b/
src/vnet/ipsec/ipsec_api.c
@@
-194,8
+194,7
@@
static void vl_api_ipsec_sad_add_del_entry_t_handler
sa.spi = ntohl (mp->spi);
sa.protocol = mp->protocol;
/* check for unsupported crypto-alg */
sa.spi = ntohl (mp->spi);
sa.protocol = mp->protocol;
/* check for unsupported crypto-alg */
- if (mp->crypto_algorithm < IPSEC_CRYPTO_ALG_AES_CBC_128 ||
- mp->crypto_algorithm >= IPSEC_CRYPTO_N_ALG)
+ if (mp->crypto_algorithm >= IPSEC_CRYPTO_N_ALG)
{
clib_warning ("unsupported crypto-alg: '%U'", format_ipsec_crypto_alg,
mp->crypto_algorithm);
{
clib_warning ("unsupported crypto-alg: '%U'", format_ipsec_crypto_alg,
mp->crypto_algorithm);
@@
-220,6
+219,7
@@
static void vl_api_ipsec_sad_add_del_entry_t_handler
sa.use_esn = mp->use_extended_sequence_number;
sa.is_tunnel = mp->is_tunnel;
sa.is_tunnel_ip6 = mp->is_tunnel_ipv6;
sa.use_esn = mp->use_extended_sequence_number;
sa.is_tunnel = mp->is_tunnel;
sa.is_tunnel_ip6 = mp->is_tunnel_ipv6;
+ sa.udp_encap = mp->udp_encap;
if (sa.is_tunnel_ip6)
{
clib_memcpy (&sa.tunnel_src_addr, mp->tunnel_src_address, 16);
if (sa.is_tunnel_ip6)
{
clib_memcpy (&sa.tunnel_src_addr, mp->tunnel_src_address, 16);
@@
-252,7
+252,7
@@
out:
}
static void
}
static void
-send_ipsec_spd_details (ipsec_policy_t * p,
unix_shared_memory_queue_t * q
,
+send_ipsec_spd_details (ipsec_policy_t * p,
vl_api_registration_t * reg
,
u32 context)
{
vl_api_ipsec_spd_details_t *mp;
u32 context)
{
vl_api_ipsec_spd_details_t *mp;
@@
-290,21
+290,21
@@
send_ipsec_spd_details (ipsec_policy_t * p, unix_shared_memory_queue_t * q,
mp->bytes = clib_host_to_net_u64 (p->counter.bytes);
mp->packets = clib_host_to_net_u64 (p->counter.packets);
mp->bytes = clib_host_to_net_u64 (p->counter.bytes);
mp->packets = clib_host_to_net_u64 (p->counter.packets);
- vl_
msg_api_send_shmem (q, (u8 *) &
mp);
+ vl_
api_send_msg (reg, (u8 *)
mp);
}
static void
vl_api_ipsec_spd_dump_t_handler (vl_api_ipsec_spd_dump_t * mp)
{
}
static void
vl_api_ipsec_spd_dump_t_handler (vl_api_ipsec_spd_dump_t * mp)
{
-
unix_shared_memory_queue_t *q
;
+
vl_api_registration_t *reg
;
ipsec_main_t *im = &ipsec_main;
ipsec_policy_t *policy;
ipsec_spd_t *spd;
uword *p;
u32 spd_index;
#if WITH_LIBSSL > 0
ipsec_main_t *im = &ipsec_main;
ipsec_policy_t *policy;
ipsec_spd_t *spd;
uword *p;
u32 spd_index;
#if WITH_LIBSSL > 0
-
q = vl_api_client_index_to_input_queue
(mp->client_index);
- if (
q == 0
)
+
reg = vl_api_client_index_to_registration
(mp->client_index);
+ if (
!reg
)
return;
p = hash_get (im->spd_index_by_spd_id, ntohl (mp->spd_id));
return;
p = hash_get (im->spd_index_by_spd_id, ntohl (mp->spd_id));
@@
-318,7
+318,7
@@
vl_api_ipsec_spd_dump_t_handler (vl_api_ipsec_spd_dump_t * mp)
pool_foreach (policy, spd->policies,
({
if (mp->sa_id == ~(0) || ntohl (mp->sa_id) == policy->sa_id)
pool_foreach (policy, spd->policies,
({
if (mp->sa_id == ~(0) || ntohl (mp->sa_id) == policy->sa_id)
- send_ipsec_spd_details (policy,
q
,
+ send_ipsec_spd_details (policy,
reg
,
mp->context);}
));
/* *INDENT-ON* */
mp->context);}
));
/* *INDENT-ON* */
@@
-385,6
+385,8
@@
vl_api_ipsec_tunnel_if_add_del_t_handler (vl_api_ipsec_tunnel_if_add_del_t *
mp->local_integ_key_len);
memcpy (&tun.remote_integ_key, &mp->remote_integ_key,
mp->remote_integ_key_len);
mp->local_integ_key_len);
memcpy (&tun.remote_integ_key, &mp->remote_integ_key,
mp->remote_integ_key_len);
+ tun.renumber = mp->renumber;
+ tun.show_instance = ntohl (mp->show_instance);
rv = ipsec_add_del_tunnel_if_internal (vnm, &tun, &sw_if_index);
rv = ipsec_add_del_tunnel_if_internal (vnm, &tun, &sw_if_index);
@@
-400,7
+402,7
@@
vl_api_ipsec_tunnel_if_add_del_t_handler (vl_api_ipsec_tunnel_if_add_del_t *
}
static void
}
static void
-send_ipsec_sa_details (ipsec_sa_t * sa,
unix_shared_memory_queue_t * q
,
+send_ipsec_sa_details (ipsec_sa_t * sa,
vl_api_registration_t * reg
,
u32 context, u32 sw_if_index)
{
vl_api_ipsec_sa_details_t *mp;
u32 context, u32 sw_if_index)
{
vl_api_ipsec_sa_details_t *mp;
@@
-455,15
+457,16
@@
send_ipsec_sa_details (ipsec_sa_t * sa, unix_shared_memory_queue_t * q,
if (sa->use_anti_replay)
mp->replay_window = clib_host_to_net_u64 (sa->replay_window);
mp->total_data_size = clib_host_to_net_u64 (sa->total_data_size);
if (sa->use_anti_replay)
mp->replay_window = clib_host_to_net_u64 (sa->replay_window);
mp->total_data_size = clib_host_to_net_u64 (sa->total_data_size);
+ mp->udp_encap = sa->udp_encap;
- vl_
msg_api_send_shmem (q, (u8 *) &
mp);
+ vl_
api_send_msg (reg, (u8 *)
mp);
}
static void
vl_api_ipsec_sa_dump_t_handler (vl_api_ipsec_sa_dump_t * mp)
{
}
static void
vl_api_ipsec_sa_dump_t_handler (vl_api_ipsec_sa_dump_t * mp)
{
-
unix_shared_memory_queue_t *q
;
+
vl_api_registration_t *reg
;
ipsec_main_t *im = &ipsec_main;
vnet_main_t *vnm = im->vnet_main;
ipsec_sa_t *sa;
ipsec_main_t *im = &ipsec_main;
vnet_main_t *vnm = im->vnet_main;
ipsec_sa_t *sa;
@@
-471,8
+474,8
@@
vl_api_ipsec_sa_dump_t_handler (vl_api_ipsec_sa_dump_t * mp)
u32 *sa_index_to_tun_if_index = 0;
#if WITH_LIBSSL > 0
u32 *sa_index_to_tun_if_index = 0;
#if WITH_LIBSSL > 0
-
q = vl_api_client_index_to_input_queue
(mp->client_index);
- if (
q == 0
|| pool_elts (im->sad) == 0)
+
reg = vl_api_client_index_to_registration
(mp->client_index);
+ if (
!reg
|| pool_elts (im->sad) == 0)
return;
vec_validate_init_empty (sa_index_to_tun_if_index, vec_len (im->sad) - 1,
return;
vec_validate_init_empty (sa_index_to_tun_if_index, vec_len (im->sad) - 1,
@@
-493,7
+496,7
@@
vl_api_ipsec_sa_dump_t_handler (vl_api_ipsec_sa_dump_t * mp)
pool_foreach (sa, im->sad,
({
if (mp->sa_id == ~(0) || ntohl (mp->sa_id) == sa->id)
pool_foreach (sa, im->sad,
({
if (mp->sa_id == ~(0) || ntohl (mp->sa_id) == sa->id)
- send_ipsec_sa_details (sa,
q
, mp->context,
+ send_ipsec_sa_details (sa,
reg
, mp->context,
sa_index_to_tun_if_index[sa - im->sad]);
}));
/* *INDENT-ON* */
sa_index_to_tun_if_index[sa - im->sad]);
}));
/* *INDENT-ON* */
@@
-524,7
+527,7
@@
vl_api_ipsec_tunnel_if_set_key_t_handler (vl_api_ipsec_tunnel_if_set_key_t *
case IPSEC_IF_SET_KEY_TYPE_LOCAL_CRYPTO:
case IPSEC_IF_SET_KEY_TYPE_REMOTE_CRYPTO:
if (mp->alg < IPSEC_CRYPTO_ALG_AES_CBC_128 ||
case IPSEC_IF_SET_KEY_TYPE_LOCAL_CRYPTO:
case IPSEC_IF_SET_KEY_TYPE_REMOTE_CRYPTO:
if (mp->alg < IPSEC_CRYPTO_ALG_AES_CBC_128 ||
- mp->alg > IPSEC_CRYPTO_N_ALG)
+ mp->alg >
=
IPSEC_CRYPTO_N_ALG)
{
rv = VNET_API_ERROR_UNIMPLEMENTED;
goto out;
{
rv = VNET_API_ERROR_UNIMPLEMENTED;
goto out;
@@
-532,7
+535,7
@@
vl_api_ipsec_tunnel_if_set_key_t_handler (vl_api_ipsec_tunnel_if_set_key_t *
break;
case IPSEC_IF_SET_KEY_TYPE_LOCAL_INTEG:
case IPSEC_IF_SET_KEY_TYPE_REMOTE_INTEG:
break;
case IPSEC_IF_SET_KEY_TYPE_LOCAL_INTEG:
case IPSEC_IF_SET_KEY_TYPE_REMOTE_INTEG:
- if (mp->alg > IPSEC_INTEG_N_ALG)
+ if (mp->alg >
=
IPSEC_INTEG_N_ALG)
{
rv = VNET_API_ERROR_UNIMPLEMENTED;
goto out;
{
rv = VNET_API_ERROR_UNIMPLEMENTED;
goto out;