diff options
| author |   Neale Ranns <nranns@cisco.com> | 2020-01-21 04:58:02 +0000 |
|---|---|---|
| committer | Neale Ranns <nranns@cisco.com> | 2020-01-22 22:35:03 +0000 |
| commit | 7ec120e8dd8ab366fab27eca4e6402f213e24cc8 (patch) | |
| tree | 936060953b9f27189b3172d2692c2768565126c5 /src/vnet/ipsec/ipsec_tun_in.c | |
| parent | 66300f6ab8da91201e78dcf502b0f6c872e5f23f (diff) | |
ipsec: re-enable DPDK IPSec for tunnel decap/encap (VPP-1823)
Type: fix
Change-Id: Iff9b1960b122f7d326efc37770b4ae3e81eb3122
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/ipsec/ipsec_tun_in.c')
| -rw-r--r-- | src/vnet/ipsec/ipsec_tun_in.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/vnet/ipsec/ipsec_tun_in.c b/src/vnet/ipsec/ipsec_tun_in.c index e6ad67b433a..35d268f58bc 100644 --- a/src/vnet/ipsec/ipsec_tun_in.c +++ b/src/vnet/ipsec/ipsec_tun_in.c @@ -55,8 +55,7 @@ typedef enum ipsec_tun_next_t_ #define _(v, s) IPSEC_TUN_PROTECT_NEXT_##v, foreach_ipsec_input_next #undef _ - IPSEC_TUN_PROTECT_NEXT_DECRYPT, - IPSEC_TUN_PROTECT_N_NEXT, + IPSEC_TUN_PROTECT_N_NEXT, } ipsec_tun_next_t; typedef struct @@ -311,7 +310,7 @@ ipsec_tun_protect_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, n_bytes = len0; } - next[0] = IPSEC_TUN_PROTECT_NEXT_DECRYPT; + next[0] = im->esp4_decrypt_tun_next_index; //IPSEC_TUN_PROTECT_NEXT_DECRYPT; } trace00: if (PREDICT_FALSE (is_trace)) @@ -358,8 +357,7 @@ VLIB_NODE_FN (ipsec4_tun_input_node) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * from_frame) { - return ipsec_tun_protect_input_inline (vm, node, from_frame, - 0 /* is_ip6 */ ); + return ipsec_tun_protect_input_inline (vm, node, from_frame, 0); } /* *INDENT-OFF* */ @@ -374,7 +372,6 @@ VLIB_REGISTER_NODE (ipsec4_tun_input_node) = { .next_nodes = { [IPSEC_TUN_PROTECT_NEXT_DROP] = "ip4-drop", [IPSEC_TUN_PROTECT_NEXT_PUNT] = "punt-dispatch", - [IPSEC_TUN_PROTECT_NEXT_DECRYPT] = "esp4-decrypt-tun", } }; /* *INDENT-ON* */ @@ -383,8 +380,7 @@ VLIB_NODE_FN (ipsec6_tun_input_node) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * from_frame) { - return ipsec_tun_protect_input_inline (vm, node, from_frame, - 1 /* is_ip6 */ ); + return ipsec_tun_protect_input_inline (vm, node, from_frame, 1); } /* *INDENT-OFF* */ @@ -399,7 +395,6 @@ VLIB_REGISTER_NODE (ipsec6_tun_input_node) = { .next_nodes = { [IPSEC_TUN_PROTECT_NEXT_DROP] = "ip6-drop", [IPSEC_TUN_PROTECT_NEXT_PUNT] = "punt-dispatch", - [IPSEC_TUN_PROTECT_NEXT_DECRYPT] = "esp6-decrypt-tun", } }; /* *INDENT-ON* */ |