X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fipsec.h;h=975ebc63a482376fcc52d221d32a6c86d0fcc2e9;hb=dbf68c9aa258238260df34c0e864223ea4f3a987;hp=821b7ed310717c78852595540d0ce1732c7fa18c;hpb=7c22ff72aa54d15484fdc70e0c1b8a9ec5e880e0;p=vpp.git

diff --git a/src/vnet/ipsec/ipsec.h b/src/vnet/ipsec/ipsec.h
index 821b7ed3107..975ebc63a48 100644
--- a/src/vnet/ipsec/ipsec.h
+++ b/src/vnet/ipsec/ipsec.h
@@ -25,7 +25,6 @@
 #include <vnet/ipsec/ipsec_spd.h>
 #include <vnet/ipsec/ipsec_spd_policy.h>
 #include <vnet/ipsec/ipsec_sa.h>
-#include <vnet/ipsec/ipsec_if.h>
 
 typedef clib_error_t *(*add_del_sa_sess_cb_t) (u32 sa_index, u8 is_add);
 typedef clib_error_t *(*check_support_cb_t) (ipsec_sa_t * sa);
@@ -62,19 +61,24 @@ typedef struct
   u32 esp6_decrypt_node_index;
   u32 esp6_encrypt_next_index;
   u32 esp6_decrypt_next_index;
+  u32 esp4_encrypt_tun_feature_index;
+  u32 esp6_encrypt_tun_feature_index;
 } ipsec_esp_backend_t;
 
 typedef struct
 {
-  vnet_crypto_op_type_t enc_op_type;
-  vnet_crypto_op_type_t dec_op_type;
+  vnet_crypto_op_id_t enc_op_id;
+  vnet_crypto_op_id_t dec_op_id;
+  vnet_crypto_alg_t alg;
   u8 iv_size;
   u8 block_size;
+  u8 icv_size;
 } ipsec_main_crypto_alg_t;
 
 typedef struct
 {
-  vnet_crypto_op_type_t op_type;
+  vnet_crypto_op_id_t op_id;
+  vnet_crypto_alg_t alg;
   u8 icv_size;
 } ipsec_main_integ_alg_t;
 
@@ -93,9 +97,6 @@ typedef struct
   /* pool of policies */
   ipsec_policy_t *policies;
 
-  /* pool of tunnel interfaces */
-  ipsec_tunnel_if_t *tunnel_interfaces;
-
   uword *tunnel_index_by_key;
 
   /* convenience */
@@ -110,6 +111,8 @@ typedef struct
   uword *ipsec6_if_pool_index_by_key;
   uword *ipsec_if_real_dev_by_show_dev;
   uword *ipsec_if_by_sw_if_index;
+  uword *tun4_protect_by_key;
+  uword *tun6_protect_by_key;
 
   /* node indices */
   u32 error_drop_node_index;
@@ -131,6 +134,14 @@ typedef struct
   u32 ah6_encrypt_next_index;
   u32 ah6_decrypt_next_index;
 
+  /* tun encrypt arcs and feature nodes */
+  u32 esp4_encrypt_tun_feature_index;
+  u32 esp6_encrypt_tun_feature_index;
+
+  /* tun nodes to drop packets when no crypto alg set on outbound SA */
+  u32 esp4_no_crypto_tun_feature_index;
+  u32 esp6_no_crypto_tun_feature_index;
+
   /* pool of ah backends */
   ipsec_ah_backend_t *ah_backends;
   /* pool of esp backends */
@@ -158,6 +169,7 @@ typedef enum ipsec_format_flags_t_
 {
   IPSEC_FORMAT_BRIEF = 0,
   IPSEC_FORMAT_DETAIL = (1 << 0),
+  IPSEC_FORMAT_INSECURE = (1 << 1),
 } ipsec_format_flags_t;
 
 extern ipsec_main_t ipsec_main;
@@ -211,8 +223,10 @@ u32 ipsec_register_ah_backend (vlib_main_t * vm, ipsec_main_t * im,
 u32 ipsec_register_esp_backend (vlib_main_t * vm, ipsec_main_t * im,
 				const char *name,
 				const char *esp4_encrypt_node_name,
+				const char *esp4_encrypt_tun_node_name,
 				const char *esp4_decrypt_node_name,
 				const char *esp6_encrypt_node_name,
+				const char *esp6_encrypt_tun_node_name,
 				const char *esp6_decrypt_node_name,
 				check_support_cb_t esp_check_support_cb,
 				add_del_sa_sess_cb_t esp_add_del_sa_sess_cb);
@@ -220,12 +234,18 @@ u32 ipsec_register_esp_backend (vlib_main_t * vm, ipsec_main_t * im,
 int ipsec_select_ah_backend (ipsec_main_t * im, u32 ah_backend_idx);
 int ipsec_select_esp_backend (ipsec_main_t * im, u32 esp_backend_idx);
 
+clib_error_t *ipsec_rsc_in_use (ipsec_main_t * im);
+
 always_inline ipsec_sa_t *
 ipsec_sa_get (u32 sa_index)
 {
   return (pool_elt_at_index (ipsec_main.sad, sa_index));
 }
 
+void ipsec_add_feature (const char *arc_name, const char *node_name,
+			u32 * out_feature_index);
+
+
 #endif /* __IPSEC_H__ */
 
 /*