X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fikev2%2Fikev2_api.c;h=d104e54579aa27292cb2d202cdc90f47f5305fbb;hb=af2cc6425;hp=7bac98f9b4f83e2994d5747f079b6ac78babb0e2;hpb=6a9bd81886772b5ffeb367736fb83bf95f37435f;p=vpp.git diff --git a/src/plugins/ikev2/ikev2_api.c b/src/plugins/ikev2/ikev2_api.c index 7bac98f9b4f..d104e54579a 100644 --- a/src/plugins/ikev2/ikev2_api.c +++ b/src/plugins/ikev2/ikev2_api.c @@ -21,7 +21,7 @@ #include #include #include - +#include #include #include @@ -32,6 +32,7 @@ #define vl_endianfun /* define message structures */ +#include #include #undef vl_endianfun @@ -42,13 +43,37 @@ extern ikev2_main_t ikev2_main; #define REPLY_MSG_ID_BASE ikev2_main.msg_id_base #include +#define IKEV2_MAX_DATA_LEN (1 << 10) + +static u32 +ikev2_encode_sa_index (u32 sai, u32 ti) +{ + return (ti << 16) | sai; +} + +static void +ikev2_decode_sa_index (u32 api_sai, u32 * sai, u32 * ti) +{ + *sai = api_sai & 0xffff; + *ti = api_sai >> 16; +} + static void -cp_transforms (vl_api_ikev2_transforms_set_t * vl_api_ts, - ikev2_transforms_set * ts) +cp_ike_transforms (vl_api_ikev2_ike_transforms_t * vl_api_ts, + ikev2_transforms_set * ts) +{ + vl_api_ts->crypto_alg = ts->crypto_alg; + vl_api_ts->integ_alg = ts->integ_alg; + vl_api_ts->dh_group = ts->dh_type; + vl_api_ts->crypto_key_size = ts->crypto_key_size; +} + +static void +cp_esp_transforms (vl_api_ikev2_esp_transforms_t * vl_api_ts, + ikev2_transforms_set * ts) { vl_api_ts->crypto_alg = ts->crypto_alg; vl_api_ts->integ_alg = ts->integ_alg; - vl_api_ts->dh_type = ts->dh_type; vl_api_ts->crypto_key_size = ts->crypto_key_size; } @@ -69,16 +94,14 @@ cp_id (vl_api_ikev2_id_t * vl_api_id, ikev2_id_t * id) } static void -cp_ts (vl_api_ikev2_ts_t * vl_api_ts, ikev2_ts_t * ts) +cp_ts (vl_api_ikev2_ts_t * vl_api_ts, ikev2_ts_t * ts, u8 is_local) { - vl_api_ts->ts_type = ts->ts_type; + vl_api_ts->is_local = is_local; vl_api_ts->protocol_id = ts->protocol_id; - vl_api_ts->selector_len = ts->selector_len; vl_api_ts->start_port = ts->start_port; vl_api_ts->end_port = ts->end_port; - clib_memcpy (&vl_api_ts->start_addr, &ts->start_addr, - sizeof (ip4_address_t)); - clib_memcpy (&vl_api_ts->end_addr, &ts->end_addr, sizeof (ip4_address_t)); + ip_address_encode2 (&ts->start_addr, &vl_api_ts->start_addr); + ip_address_encode2 (&ts->end_addr, &vl_api_ts->end_addr); } static void @@ -95,8 +118,19 @@ cp_responder (vl_api_ikev2_responder_t * vl_api_responder, ikev2_responder_t * responder) { vl_api_responder->sw_if_index = responder->sw_if_index; - clib_memcpy (&vl_api_responder->ip4, &responder->ip4, - sizeof (ip4_address_t)); + ip_address_encode2 (&responder->addr, &vl_api_responder->addr); +} + +void +cp_sa_transform (vl_api_ikev2_sa_transform_t * vl_tr, + ikev2_sa_transform_t * tr) +{ + vl_tr->transform_type = tr->type; + vl_tr->key_len = tr->key_len; + vl_tr->key_trunc = tr->key_trunc; + vl_tr->block_size = tr->block_size; + vl_tr->dh_group = tr->dh_group; + vl_tr->transform_id = tr->encr_type; } static void @@ -116,14 +150,14 @@ send_profile (ikev2_profile_t * profile, vl_api_registration_t * reg, size_data = vec_len (profile->name); clib_memcpy (rmp->profile.name, profile->name, size_data); - cp_transforms (&rmp->profile.ike_ts, &profile->ike_ts); - cp_transforms (&rmp->profile.esp_ts, &profile->esp_ts); + cp_ike_transforms (&rmp->profile.ike_ts, &profile->ike_ts); + cp_esp_transforms (&rmp->profile.esp_ts, &profile->esp_ts); cp_id (&rmp->profile.loc_id, &profile->loc_id); cp_id (&rmp->profile.rem_id, &profile->rem_id); - cp_ts (&rmp->profile.rem_ts, &profile->rem_ts); - cp_ts (&rmp->profile.loc_ts, &profile->loc_ts); + cp_ts (&rmp->profile.rem_ts, &profile->rem_ts, 0 /* is_local */ ); + cp_ts (&rmp->profile.loc_ts, &profile->loc_ts, 1 /* is_local */ ); cp_auth (&rmp->profile.auth, &profile->auth); @@ -131,7 +165,7 @@ send_profile (ikev2_profile_t * profile, vl_api_registration_t * reg, rmp->profile.udp_encap = profile->udp_encap; rmp->profile.tun_itf = profile->tun_itf; - + rmp->profile.natt_disabled = profile->natt_disabled; rmp->profile.ipsec_over_udp_port = profile->ipsec_over_udp_port; rmp->profile.lifetime = profile->lifetime; @@ -155,10 +189,274 @@ vl_api_ikev2_profile_dump_t_handler (vl_api_ikev2_profile_dump_t * mp) return; /* *INDENT-OFF* */ - pool_foreach (profile, im->profiles, - ({ + pool_foreach (profile, im->profiles) + { send_profile (profile, reg, mp->context); - })); + } + /* *INDENT-ON* */ +} + +static void +ikev2_copy_stats (vl_api_ikev2_sa_stats_t *dst, const ikev2_stats_t *src) +{ + dst->n_rekey_req = src->n_rekey_req; + dst->n_keepalives = src->n_keepalives; + dst->n_retransmit = src->n_retransmit; + dst->n_init_sa_retransmit = src->n_init_retransmit; + dst->n_sa_init_req = src->n_sa_init_req; + dst->n_sa_auth_req = src->n_sa_auth_req; +} + +static void +send_sa (ikev2_sa_t * sa, vl_api_ikev2_sa_dump_t * mp, u32 api_sa_index) +{ + vl_api_ikev2_sa_details_t *rmp = 0; + int rv = 0; + ikev2_sa_transform_t *tr; + + /* *INDENT-OFF* */ + REPLY_MACRO2_ZERO (VL_API_IKEV2_SA_DETAILS, + { + vl_api_ikev2_sa_t *rsa = &rmp->sa; + vl_api_ikev2_keys_t* k = &rsa->keys; + rsa->profile_index = rsa->profile_index; + rsa->sa_index = api_sa_index; + ip_address_encode2 (&sa->iaddr, &rsa->iaddr); + ip_address_encode2 (&sa->raddr, &rsa->raddr); + rsa->ispi = sa->ispi; + rsa->rspi = sa->rspi; + cp_id(&rsa->i_id, &sa->i_id); + cp_id(&rsa->r_id, &sa->r_id); + + tr = ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR); + if (tr) + cp_sa_transform (&rsa->encryption, tr); + + tr = ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_PRF); + if (tr) + cp_sa_transform (&rsa->prf, tr); + + tr = ikev2_sa_get_td_for_type (sa->r_proposals, + IKEV2_TRANSFORM_TYPE_INTEG); + if (tr) + cp_sa_transform (&rsa->integrity, tr); + + tr = ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_DH); + if (tr) + cp_sa_transform (&rsa->dh, tr); + + k->sk_d_len = vec_len (sa->sk_d); + clib_memcpy (&k->sk_d, sa->sk_d, k->sk_d_len); + + k->sk_ai_len = vec_len (sa->sk_ai); + clib_memcpy (&k->sk_ai, sa->sk_ai, k->sk_ai_len); + + k->sk_ar_len = vec_len (sa->sk_ar); + clib_memcpy (&k->sk_ar, sa->sk_ar, k->sk_ar_len); + + k->sk_ei_len = vec_len (sa->sk_ei); + clib_memcpy (&k->sk_ei, sa->sk_ei, k->sk_ei_len); + + k->sk_er_len = vec_len (sa->sk_er); + clib_memcpy (&k->sk_er, sa->sk_er, k->sk_er_len); + + k->sk_pi_len = vec_len (sa->sk_pi); + clib_memcpy (&k->sk_pi, sa->sk_pi, k->sk_pi_len); + + k->sk_pr_len = vec_len (sa->sk_pr); + clib_memcpy (&k->sk_pr, sa->sk_pr, k->sk_pr_len); + + ikev2_copy_stats (&rsa->stats, &sa->stats); + + vl_api_ikev2_sa_t_endian(rsa); + }); + /* *INDENT-ON* */ +} + +static void +vl_api_ikev2_sa_dump_t_handler (vl_api_ikev2_sa_dump_t * mp) +{ + ikev2_main_t *km = &ikev2_main; + ikev2_main_per_thread_data_t *tkm; + ikev2_sa_t *sa; + + vec_foreach (tkm, km->per_thread_data) + { + /* *INDENT-OFF* */ + pool_foreach (sa, tkm->sas) + { + u32 api_sa_index = ikev2_encode_sa_index (sa - tkm->sas, + tkm - km->per_thread_data); + send_sa (sa, mp, api_sa_index); + } + /* *INDENT-ON* */ + } +} + + +static void +send_child_sa (ikev2_child_sa_t * child, + vl_api_ikev2_child_sa_dump_t * mp, u32 child_sa_index, + u32 sa_index) +{ + vl_api_ikev2_child_sa_details_t *rmp = 0; + int rv = 0; + ikev2_sa_transform_t *tr; + + /* *INDENT-OFF* */ + REPLY_MACRO2_ZERO (VL_API_IKEV2_CHILD_SA_DETAILS, + { + vl_api_ikev2_keys_t *k = &rmp->child_sa.keys; + rmp->child_sa.child_sa_index = child_sa_index; + rmp->child_sa.sa_index = sa_index; + rmp->child_sa.i_spi = + child->i_proposals ? child->i_proposals[0].spi : 0; + rmp->child_sa.r_spi = + child->r_proposals ? child->r_proposals[0].spi : 0; + + tr = ikev2_sa_get_td_for_type (child->r_proposals, + IKEV2_TRANSFORM_TYPE_ENCR); + if (tr) + cp_sa_transform (&rmp->child_sa.encryption, tr); + + tr = ikev2_sa_get_td_for_type (child->r_proposals, + IKEV2_TRANSFORM_TYPE_INTEG); + if (tr) + cp_sa_transform (&rmp->child_sa.integrity, tr); + + tr = ikev2_sa_get_td_for_type (child->r_proposals, + IKEV2_TRANSFORM_TYPE_ESN); + if (tr) + cp_sa_transform (&rmp->child_sa.esn, tr); + + k->sk_ei_len = vec_len (child->sk_ei); + clib_memcpy (&k->sk_ei, child->sk_ei, k->sk_ei_len); + + k->sk_er_len = vec_len (child->sk_er); + clib_memcpy (&k->sk_er, child->sk_er, k->sk_er_len); + + if (vec_len (child->sk_ai)) + { + k->sk_ai_len = vec_len (child->sk_ai); + clib_memcpy (&k->sk_ai, child->sk_ai, + k->sk_ai_len); + + k->sk_ar_len = vec_len (child->sk_ar); + clib_memcpy (&k->sk_ar, child->sk_ar, + k->sk_ar_len); + } + + vl_api_ikev2_child_sa_t_endian (&rmp->child_sa); + }); + /* *INDENT-ON* */ +} + +static void +vl_api_ikev2_child_sa_dump_t_handler (vl_api_ikev2_child_sa_dump_t * mp) +{ + ikev2_main_t *im = &ikev2_main; + ikev2_main_per_thread_data_t *tkm; + ikev2_sa_t *sa; + ikev2_child_sa_t *child; + u32 sai = ~0, ti = ~0; + + ikev2_decode_sa_index (clib_net_to_host_u32 (mp->sa_index), &sai, &ti); + + if (vec_len (im->per_thread_data) <= ti) + return; + + tkm = vec_elt_at_index (im->per_thread_data, ti); + + if (pool_len (tkm->sas) <= sai || pool_is_free_index (tkm->sas, sai)) + return; + + sa = pool_elt_at_index (tkm->sas, sai); + + vec_foreach (child, sa->childs) + { + u32 child_sa_index = child - sa->childs; + send_child_sa (child, mp, child_sa_index, sai); + } +} + +static void + vl_api_ikev2_traffic_selector_dump_t_handler + (vl_api_ikev2_traffic_selector_dump_t * mp) +{ + ikev2_main_t *im = &ikev2_main; + ikev2_main_per_thread_data_t *tkm; + ikev2_sa_t *sa; + ikev2_child_sa_t *child; + ikev2_ts_t *ts; + u32 sai = ~0, ti = ~0; + + u32 api_sa_index = clib_net_to_host_u32 (mp->sa_index); + u32 child_sa_index = clib_net_to_host_u32 (mp->child_sa_index); + ikev2_decode_sa_index (api_sa_index, &sai, &ti); + + if (vec_len (im->per_thread_data) <= ti) + return; + + tkm = vec_elt_at_index (im->per_thread_data, ti); + + if (pool_len (tkm->sas) <= sai || pool_is_free_index (tkm->sas, sai)) + return; + + sa = pool_elt_at_index (tkm->sas, sai); + + if (vec_len (sa->childs) <= child_sa_index) + return; + + child = vec_elt_at_index (sa->childs, child_sa_index); + + vec_foreach (ts, mp->is_initiator ? child->tsi : child->tsr) + { + vl_api_ikev2_traffic_selector_details_t *rmp = 0; + int rv = 0; + + /* *INDENT-OFF* */ + REPLY_MACRO2_ZERO (VL_API_IKEV2_TRAFFIC_SELECTOR_DETAILS, + { + rmp->ts.sa_index = api_sa_index; + rmp->ts.child_sa_index = child_sa_index; + cp_ts (&rmp->ts, ts, mp->is_initiator); + vl_api_ikev2_ts_t_endian (&rmp->ts); + }); + /* *INDENT-ON* */ + } +} + +static void +vl_api_ikev2_nonce_get_t_handler (vl_api_ikev2_nonce_get_t * mp) +{ + ikev2_main_t *im = &ikev2_main; + ikev2_main_per_thread_data_t *tkm; + ikev2_sa_t *sa; + u32 sai = ~0, ti = ~0; + + ikev2_decode_sa_index (clib_net_to_host_u32 (mp->sa_index), &sai, &ti); + + if (vec_len (im->per_thread_data) <= ti) + return; + + tkm = vec_elt_at_index (im->per_thread_data, ti); + + if (pool_len (tkm->sas) <= sai || pool_is_free_index (tkm->sas, sai)) + return; + + sa = pool_elt_at_index (tkm->sas, sai); + + u8 *nonce = mp->is_initiator ? sa->i_nonce : sa->r_nonce; + vl_api_ikev2_nonce_get_reply_t *rmp = 0; + int data_len = vec_len (nonce); + int rv = 0; + + /* *INDENT-OFF* */ + REPLY_MACRO3_ZERO (VL_API_IKEV2_NONCE_GET_REPLY, data_len, + { + rmp->data_len = clib_host_to_net_u32 (data_len); + clib_memcpy (rmp->nonce, nonce, data_len); + }); /* *INDENT-ON* */ } @@ -198,7 +496,11 @@ static void error = ikev2_set_liveness_params (clib_net_to_host_u32 (mp->period), clib_net_to_host_u32 (mp->max_retries)); if (error) - rv = VNET_API_ERROR_UNSPECIFIED; + { + ikev2_log_error ("%U", format_clib_error, error); + clib_error_free (error); + rv = VNET_API_ERROR_UNSPECIFIED; + } #else rv = VNET_API_ERROR_UNIMPLEMENTED; #endif @@ -219,7 +521,11 @@ vl_api_ikev2_profile_add_del_t_handler (vl_api_ikev2_profile_add_del_t * mp) error = ikev2_add_del_profile (vm, tmp, mp->is_add); vec_free (tmp); if (error) - rv = VNET_API_ERROR_UNSPECIFIED; + { + ikev2_log_error ("%U", format_clib_error, error); + clib_error_free (error); + rv = VNET_API_ERROR_UNSPECIFIED; + } #else rv = VNET_API_ERROR_UNIMPLEMENTED; #endif @@ -238,14 +544,24 @@ static void vlib_main_t *vm = vlib_get_main (); clib_error_t *error; int data_len = ntohl (mp->data_len); - u8 *tmp = format (0, "%s", mp->name); - u8 *data = vec_new (u8, data_len); - clib_memcpy (data, mp->data, data_len); - error = ikev2_set_profile_auth (vm, tmp, mp->auth_method, data, mp->is_hex); - vec_free (tmp); - vec_free (data); - if (error) - rv = VNET_API_ERROR_UNSPECIFIED; + if (data_len > 0 && data_len <= IKEV2_MAX_DATA_LEN) + { + u8 *tmp = format (0, "%s", mp->name); + u8 *data = vec_new (u8, data_len); + clib_memcpy (data, mp->data, data_len); + error = + ikev2_set_profile_auth (vm, tmp, mp->auth_method, data, mp->is_hex); + vec_free (tmp); + vec_free (data); + if (error) + { + ikev2_log_error ("%U", format_clib_error, error); + clib_error_free (error); + rv = VNET_API_ERROR_UNSPECIFIED; + } + } + else + rv = VNET_API_ERROR_INVALID_VALUE; #else rv = VNET_API_ERROR_UNIMPLEMENTED; #endif @@ -264,13 +580,22 @@ vl_api_ikev2_profile_set_id_t_handler (vl_api_ikev2_profile_set_id_t * mp) clib_error_t *error; u8 *tmp = format (0, "%s", mp->name); int data_len = ntohl (mp->data_len); - u8 *data = vec_new (u8, data_len); - clib_memcpy (data, mp->data, data_len); - error = ikev2_set_profile_id (vm, tmp, mp->id_type, data, mp->is_local); - vec_free (tmp); - vec_free (data); - if (error) - rv = VNET_API_ERROR_UNSPECIFIED; + if (data_len > 0 && data_len <= IKEV2_MAX_DATA_LEN) + { + u8 *data = vec_new (u8, data_len); + clib_memcpy (data, mp->data, data_len); + error = ikev2_set_profile_id (vm, tmp, mp->id_type, data, mp->is_local); + vec_free (tmp); + vec_free (data); + if (error) + { + ikev2_log_error ("%U", format_clib_error, error); + clib_error_free (error); + rv = VNET_API_ERROR_UNSPECIFIED; + } + } + else + rv = VNET_API_ERROR_INVALID_VALUE; #else rv = VNET_API_ERROR_UNIMPLEMENTED; #endif @@ -292,12 +617,16 @@ static void error = ikev2_set_profile_udp_encap (vm, tmp); vec_free (tmp); if (error) - rv = VNET_API_ERROR_UNSPECIFIED; + { + ikev2_log_error ("%U", format_clib_error, error); + clib_error_free (error); + rv = VNET_API_ERROR_UNSPECIFIED; + } #else rv = VNET_API_ERROR_UNIMPLEMENTED; #endif - REPLY_MACRO (VL_API_IKEV2_PROFILE_SET_UDP_ENCAP); + REPLY_MACRO (VL_API_IKEV2_PROFILE_SET_UDP_ENCAP_REPLY); } static void @@ -310,15 +639,21 @@ vl_api_ikev2_profile_set_ts_t_handler (vl_api_ikev2_profile_set_ts_t * mp) vlib_main_t *vm = vlib_get_main (); clib_error_t *error; u8 *tmp = format (0, "%s", mp->name); + ip_address_t start_addr, end_addr; + ip_address_decode2 (&mp->ts.start_addr, &start_addr); + ip_address_decode2 (&mp->ts.end_addr, &end_addr); error = - ikev2_set_profile_ts (vm, tmp, mp->proto, - clib_net_to_host_u16 (mp->start_port), - clib_net_to_host_u16 (mp->end_port), - (ip4_address_t) mp->start_addr, - (ip4_address_t) mp->end_addr, mp->is_local); + ikev2_set_profile_ts (vm, tmp, mp->ts.protocol_id, + clib_net_to_host_u16 (mp->ts.start_port), + clib_net_to_host_u16 (mp->ts.end_port), + start_addr, end_addr, mp->ts.is_local); vec_free (tmp); if (error) - rv = VNET_API_ERROR_UNSPECIFIED; + { + ikev2_log_error ("%U", format_clib_error, error); + clib_error_free (error); + rv = VNET_API_ERROR_UNSPECIFIED; + } #else rv = VNET_API_ERROR_UNIMPLEMENTED; #endif @@ -338,7 +673,11 @@ vl_api_ikev2_set_local_key_t_handler (vl_api_ikev2_set_local_key_t * mp) error = ikev2_set_local_key (vm, mp->key_file); if (error) - rv = VNET_API_ERROR_UNSPECIFIED; + { + ikev2_log_error ("%U", format_clib_error, error); + clib_error_free (error); + rv = VNET_API_ERROR_UNSPECIFIED; + } #else rv = VNET_API_ERROR_UNIMPLEMENTED; #endif @@ -346,6 +685,38 @@ vl_api_ikev2_set_local_key_t_handler (vl_api_ikev2_set_local_key_t * mp) REPLY_MACRO (VL_API_IKEV2_SET_LOCAL_KEY_REPLY); } +static void +vl_api_ikev2_set_responder_hostname_t_handler ( + vl_api_ikev2_set_responder_hostname_t *mp) +{ + vl_api_ikev2_set_responder_hostname_reply_t *rmp; + int rv = 0; + +#if WITH_LIBSSL > 0 + vlib_main_t *vm = vlib_get_main (); + clib_error_t *error; + + u8 *tmp = format (0, "%s", mp->name); + u8 *hn = format (0, "%s", mp->hostname); + u32 sw_if_index = clib_net_to_host_u32 (mp->sw_if_index); + + error = ikev2_set_profile_responder_hostname (vm, tmp, hn, sw_if_index); + vec_free (tmp); + vec_free (hn); + + if (error) + { + ikev2_log_error ("%U", format_clib_error, error); + clib_error_free (error); + rv = VNET_API_ERROR_UNSPECIFIED; + } +#else + rv = VNET_API_ERROR_UNIMPLEMENTED; +#endif + + REPLY_MACRO (VL_API_IKEV2_SET_RESPONDER_HOSTNAME_REPLY); +} + static void vl_api_ikev2_set_responder_t_handler (vl_api_ikev2_set_responder_t * mp) { @@ -357,13 +728,18 @@ vl_api_ikev2_set_responder_t_handler (vl_api_ikev2_set_responder_t * mp) clib_error_t *error; u8 *tmp = format (0, "%s", mp->name); - ip4_address_t ip4; - clib_memcpy (&ip4, mp->address, sizeof (ip4)); + ip_address_t ip; + ip_address_decode2 (&mp->responder.addr, &ip); + u32 sw_if_index = clib_net_to_host_u32 (mp->responder.sw_if_index); - error = ikev2_set_profile_responder (vm, tmp, ntohl (mp->sw_if_index), ip4); + error = ikev2_set_profile_responder (vm, tmp, sw_if_index, ip); vec_free (tmp); if (error) - rv = VNET_API_ERROR_UNSPECIFIED; + { + ikev2_log_error ("%U", format_clib_error, error); + clib_error_free (error); + rv = VNET_API_ERROR_UNSPECIFIED; + } #else rv = VNET_API_ERROR_UNIMPLEMENTED; #endif @@ -385,13 +761,17 @@ vl_api_ikev2_set_ike_transforms_t_handler (vl_api_ikev2_set_ike_transforms_t * u8 *tmp = format (0, "%s", mp->name); error = - ikev2_set_profile_ike_transforms (vm, tmp, ntohl (mp->crypto_alg), - ntohl (mp->integ_alg), - ntohl (mp->dh_group), - ntohl (mp->crypto_key_size)); + ikev2_set_profile_ike_transforms (vm, tmp, mp->tr.crypto_alg, + mp->tr.integ_alg, + mp->tr.dh_group, + ntohl (mp->tr.crypto_key_size)); vec_free (tmp); if (error) - rv = VNET_API_ERROR_UNSPECIFIED; + { + ikev2_log_error ("%U", format_clib_error, error); + clib_error_free (error); + rv = VNET_API_ERROR_UNSPECIFIED; + } #else rv = VNET_API_ERROR_UNIMPLEMENTED; #endif @@ -413,13 +793,16 @@ vl_api_ikev2_set_esp_transforms_t_handler (vl_api_ikev2_set_esp_transforms_t * u8 *tmp = format (0, "%s", mp->name); error = - ikev2_set_profile_esp_transforms (vm, tmp, ntohl (mp->crypto_alg), - ntohl (mp->integ_alg), - ntohl (mp->dh_group), - ntohl (mp->crypto_key_size)); + ikev2_set_profile_esp_transforms (vm, tmp, mp->tr.crypto_alg, + mp->tr.integ_alg, + ntohl (mp->tr.crypto_key_size)); vec_free (tmp); if (error) - rv = VNET_API_ERROR_UNSPECIFIED; + { + ikev2_log_error ("%U", format_clib_error, error); + clib_error_free (error); + rv = VNET_API_ERROR_UNSPECIFIED; + } #else rv = VNET_API_ERROR_UNIMPLEMENTED; #endif @@ -448,7 +831,11 @@ vl_api_ikev2_set_sa_lifetime_t_handler (vl_api_ikev2_set_sa_lifetime_t * mp) (mp->lifetime_maxdata)); vec_free (tmp); if (error) - rv = VNET_API_ERROR_UNSPECIFIED; + { + ikev2_log_error ("%U", format_clib_error, error); + clib_error_free (error); + rv = VNET_API_ERROR_UNSPECIFIED; + } #else rv = VNET_API_ERROR_UNIMPLEMENTED; #endif @@ -497,7 +884,11 @@ static void ntohl (mp->sw_if_index)); if (error) - rv = VNET_API_ERROR_UNSPECIFIED; + { + ikev2_log_error ("%U", format_clib_error, error); + clib_error_free (error); + rv = VNET_API_ERROR_UNSPECIFIED; + } vec_free (tmp); #else rv = VNET_API_ERROR_UNIMPLEMENTED; @@ -522,7 +913,11 @@ vl_api_ikev2_initiate_sa_init_t_handler (vl_api_ikev2_initiate_sa_init_t * mp) error = ikev2_initiate_sa_init (vm, tmp); vec_free (tmp); if (error) - rv = VNET_API_ERROR_UNSPECIFIED; + { + ikev2_log_error ("%U", format_clib_error, error); + clib_error_free (error); + rv = VNET_API_ERROR_UNSPECIFIED; + } #else rv = VNET_API_ERROR_UNIMPLEMENTED; #endif @@ -543,7 +938,11 @@ vl_api_ikev2_initiate_del_ike_sa_t_handler (vl_api_ikev2_initiate_del_ike_sa_t error = ikev2_initiate_delete_ike_sa (vm, mp->ispi); if (error) - rv = VNET_API_ERROR_UNSPECIFIED; + { + ikev2_log_error ("%U", format_clib_error, error); + clib_error_free (error); + rv = VNET_API_ERROR_UNSPECIFIED; + } #else rv = VNET_API_ERROR_UNIMPLEMENTED; #endif @@ -564,7 +963,11 @@ static void error = ikev2_initiate_delete_child_sa (vm, mp->ispi); if (error) - rv = VNET_API_ERROR_UNSPECIFIED; + { + ikev2_log_error ("%U", format_clib_error, error); + clib_error_free (error); + rv = VNET_API_ERROR_UNSPECIFIED; + } #else rv = VNET_API_ERROR_UNIMPLEMENTED; #endif @@ -572,6 +975,32 @@ static void REPLY_MACRO (VL_API_IKEV2_INITIATE_DEL_CHILD_SA_REPLY); } +static void + vl_api_ikev2_profile_disable_natt_t_handler + (vl_api_ikev2_profile_disable_natt_t * mp) +{ + vl_api_ikev2_profile_disable_natt_reply_t *rmp; + int rv = 0; + +#if WITH_LIBSSL > 0 + clib_error_t *error; + + u8 *tmp = format (0, "%s", mp->name); + error = ikev2_profile_natt_disable (tmp); + vec_free (tmp); + if (error) + { + ikev2_log_error ("%U", format_clib_error, error); + clib_error_free (error); + rv = VNET_API_ERROR_UNSPECIFIED; + } +#else + rv = VNET_API_ERROR_UNIMPLEMENTED; +#endif + + REPLY_MACRO (VL_API_IKEV2_PROFILE_DISABLE_NATT_REPLY); +} + static void vl_api_ikev2_initiate_rekey_child_sa_t_handler (vl_api_ikev2_initiate_rekey_child_sa_t * mp) @@ -585,7 +1014,11 @@ static void error = ikev2_initiate_rekey_child_sa (vm, mp->ispi); if (error) - rv = VNET_API_ERROR_UNSPECIFIED; + { + ikev2_log_error ("%U", format_clib_error, error); + clib_error_free (error); + rv = VNET_API_ERROR_UNSPECIFIED; + } #else rv = VNET_API_ERROR_UNIMPLEMENTED; #endif