X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fipsec.h;h=f9ceae55a05c1776beea49ff79f6a0bde3ed5117;hb=bdc0e6b7;hp=58f0f145a5a2c242de0676a59dd31dc3fbbfe46d;hpb=cb33dc2d7a566d571c86b950b4aa92dd7ae01c3c;p=vpp.git diff --git a/src/vnet/ipsec/ipsec.h b/src/vnet/ipsec/ipsec.h index 58f0f145a5a..f9ceae55a05 100644 --- a/src/vnet/ipsec/ipsec.h +++ b/src/vnet/ipsec/ipsec.h @@ -15,12 +15,16 @@ #ifndef __IPSEC_H__ #define __IPSEC_H__ +#include +#include + #define IPSEC_FLAG_IPSEC_GRE_TUNNEL (1 << 0) #define foreach_ipsec_output_next \ _(DROP, "error-drop") \ -_(ESP_ENCRYPT, "esp-encrypt") +_(ESP_ENCRYPT, "esp-encrypt") \ +_(AH_ENCRYPT, "ah-encrypt") #define _(v, s) IPSEC_OUTPUT_NEXT_##v, typedef enum @@ -33,7 +37,8 @@ typedef enum #define foreach_ipsec_input_next \ _(DROP, "error-drop") \ -_(ESP_DECRYPT, "esp-decrypt") +_(ESP_DECRYPT, "esp-decrypt") \ +_(AH_DECRYPT, "ah-decrypt") #define _(v, s) IPSEC_INPUT_NEXT_##v, typedef enum @@ -63,7 +68,14 @@ typedef enum _(1, AES_CBC_128, "aes-cbc-128") \ _(2, AES_CBC_192, "aes-cbc-192") \ _(3, AES_CBC_256, "aes-cbc-256") \ - _(4, AES_GCM_128, "aes-gcm-128") + _(4, AES_CTR_128, "aes-ctr-128") \ + _(5, AES_CTR_192, "aes-ctr-192") \ + _(6, AES_CTR_256, "aes-ctr-256") \ + _(7, AES_GCM_128, "aes-gcm-128") \ + _(8, AES_GCM_192, "aes-gcm-192") \ + _(9, AES_GCM_256, "aes-gcm-256") \ + _(10, DES_CBC, "des-cbc") \ + _(11, 3DES_CBC, "3des-cbc") typedef enum { @@ -80,8 +92,7 @@ typedef enum _(3, SHA_256_96, "sha-256-96") /* draft-ietf-ipsec-ciph-sha-256-00 */ \ _(4, SHA_256_128, "sha-256-128") /* RFC4868 */ \ _(5, SHA_384_192, "sha-384-192") /* RFC4868 */ \ - _(6, SHA_512_256, "sha-512-256") /* RFC4868 */ \ - _(7, AES_GCM_128, "aes-gcm-128") /* RFC4106 */ + _(6, SHA_512_256, "sha-512-256") /* RFC4868 */ typedef enum { @@ -116,6 +127,7 @@ typedef struct u8 is_tunnel; u8 is_tunnel_ip6; + u8 udp_encap; ip46_address_t tunnel_src_addr; ip46_address_t tunnel_dst_addr; @@ -160,6 +172,9 @@ typedef struct u8 local_integ_key[128]; u8 remote_integ_key_len; u8 remote_integ_key[128]; + u8 renumber; + u32 show_instance; + u8 udp_encap; } ipsec_add_del_tunnel_args_t; typedef struct @@ -229,14 +244,17 @@ typedef struct typedef struct { + /* Required for pool_get_aligned */ + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); u32 input_sa_index; u32 output_sa_index; u32 hw_if_index; + u32 show_instance; } ipsec_tunnel_if_t; typedef struct { - i32 (*add_del_sa_sess_cb) (u32 sa_index, u8 is_add); + clib_error_t *(*add_del_sa_sess_cb) (u32 sa_index, u8 is_add); clib_error_t *(*check_support_cb) (ipsec_sa_t * sa); } ipsec_main_callbacks_t; @@ -266,24 +284,33 @@ typedef struct uword *spd_index_by_sw_if_index; uword *sa_index_by_sa_id; uword *ipsec_if_pool_index_by_key; + uword *ipsec_if_real_dev_by_show_dev; - /* node indeces */ + /* node indices */ u32 error_drop_node_index; u32 esp_encrypt_node_index; u32 esp_decrypt_node_index; - /* next node indeces */ + u32 ah_encrypt_node_index; + u32 ah_decrypt_node_index; + /* next node indices */ u32 esp_encrypt_next_index; u32 esp_decrypt_next_index; + u32 ah_encrypt_next_index; + u32 ah_decrypt_next_index; /* callbacks */ ipsec_main_callbacks_t cb; + + /* helper for sort function */ + ipsec_spd_t *spd_to_sort; } ipsec_main_t; -ipsec_main_t ipsec_main; +extern ipsec_main_t ipsec_main; extern vlib_node_registration_t esp_encrypt_node; extern vlib_node_registration_t esp_decrypt_node; -extern vlib_node_registration_t ipsec_if_output_node; +extern vlib_node_registration_t ah_encrypt_node; +extern vlib_node_registration_t ah_decrypt_node; extern vlib_node_registration_t ipsec_if_input_node; @@ -299,7 +326,7 @@ int ipsec_add_del_sa (vlib_main_t * vm, ipsec_sa_t * new_sa, int is_add); int ipsec_set_sa_key (vlib_main_t * vm, ipsec_sa_t * sa_update); u32 ipsec_get_sa_index_by_sa_id (u32 sa_id); -u8 *format_ipsec_if_output_trace (u8 * s, va_list * args); +u8 ipsec_is_sa_used (u32 sa_index); u8 *format_ipsec_policy_action (u8 * s, va_list * args); u8 *format_ipsec_crypto_alg (u8 * s, va_list * args); u8 *format_ipsec_integ_alg (u8 * s, va_list * args); @@ -308,13 +335,17 @@ uword unformat_ipsec_policy_action (unformat_input_t * input, va_list * args); uword unformat_ipsec_crypto_alg (unformat_input_t * input, va_list * args); uword unformat_ipsec_integ_alg (unformat_input_t * input, va_list * args); -/*u32 ipsec_add_del_tunnel_if (vnet_main_t * vnm, ipsec_add_del_tunnel_args_t * args); */ +int ipsec_add_del_tunnel_if_internal (vnet_main_t * vnm, + ipsec_add_del_tunnel_args_t * args, + u32 * sw_if_index); int ipsec_add_del_tunnel_if (ipsec_add_del_tunnel_args_t * args); int ipsec_add_del_ipsec_gre_tunnel (vnet_main_t * vnm, ipsec_add_del_ipsec_gre_tunnel_args_t * args); int ipsec_set_interface_key (vnet_main_t * vnm, u32 hw_if_index, ipsec_if_set_key_type_t type, u8 alg, u8 * key); +int ipsec_set_interface_sa (vnet_main_t * vnm, u32 hw_if_index, u32 sa_id, + u8 is_outbound); /* @@ -324,21 +355,21 @@ int ipsec_set_interface_key (vnet_main_t * vnm, u32 hw_if_index, always_inline void ipsec_alloc_empty_buffers (vlib_main_t * vm, ipsec_main_t * im) { - u32 cpu_index = os_get_cpu_number (); - uword l = vec_len (im->empty_buffers[cpu_index]); + u32 thread_index = vm->thread_index; + uword l = vec_len (im->empty_buffers[thread_index]); uword n_alloc = 0; if (PREDICT_FALSE (l < VLIB_FRAME_SIZE)) { - if (!im->empty_buffers[cpu_index]) + if (!im->empty_buffers[thread_index]) { - vec_alloc (im->empty_buffers[cpu_index], 2 * VLIB_FRAME_SIZE); + vec_alloc (im->empty_buffers[thread_index], 2 * VLIB_FRAME_SIZE); } - n_alloc = vlib_buffer_alloc (vm, im->empty_buffers[cpu_index] + l, + n_alloc = vlib_buffer_alloc (vm, im->empty_buffers[thread_index] + l, 2 * VLIB_FRAME_SIZE - l); - _vec_len (im->empty_buffers[cpu_index]) = l + n_alloc; + _vec_len (im->empty_buffers[thread_index]) = l + n_alloc; } } @@ -347,11 +378,10 @@ get_next_output_feature_node_index (vlib_buffer_t * b, vlib_node_runtime_t * nr) { u32 next; - u32 sw_if_index = vnet_buffer (b)->sw_if_index[VLIB_TX]; vlib_main_t *vm = vlib_get_main (); vlib_node_t *node = vlib_get_node (vm, nr->node_index); - vnet_feature_next (sw_if_index, &next, b); + vnet_feature_next (&next, b); return node->next_nodes[next]; }