diff options
| -rw-r--r-- | src/plugins/dpdk/ipsec/esp_decrypt.c | 11 | ||||
| -rw-r--r-- | src/plugins/dpdk/ipsec/esp_encrypt.c | 4 | ||||
| -rw-r--r-- | src/plugins/dpdk/ipsec/ipsec.h | 3 | ||||
| -rw-r--r-- | src/vnet/ipsec-gre/interface.c | 2 |
4 files changed, 12 insertions, 8 deletions
diff --git a/src/plugins/dpdk/ipsec/esp_decrypt.c b/src/plugins/dpdk/ipsec/esp_decrypt.c index bc40b4ba2f8..51e2116acb0 100644 --- a/src/plugins/dpdk/ipsec/esp_decrypt.c +++ b/src/plugins/dpdk/ipsec/esp_decrypt.c @@ -245,7 +245,10 @@ dpdk_esp_decrypt_inline (vlib_main_t * vm, } } - priv->next = DPDK_CRYPTO_INPUT_NEXT_DECRYPT_POST; + if(is_ip6) + priv->next = DPDK_CRYPTO_INPUT_NEXT_DECRYPT6_POST; + else + priv->next = DPDK_CRYPTO_INPUT_NEXT_DECRYPT4_POST; /* FIXME multi-seg */ sa0->total_data_size += b0->current_length; @@ -387,7 +390,7 @@ dpdk_esp4_decrypt_node_fn (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (dpdk_esp4_decrypt_node) = { .function = dpdk_esp4_decrypt_node_fn, - .name = "dpdk4-esp-decrypt", + .name = "dpdk-esp4-decrypt", .vector_size = sizeof (u32), .format_trace = format_esp_decrypt_trace, .type = VLIB_NODE_TYPE_INTERNAL, @@ -652,7 +655,7 @@ dpdk_esp4_decrypt_post_node_fn (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (dpdk_esp4_decrypt_post_node) = { .function = dpdk_esp4_decrypt_post_node_fn, - .name = "dpdk4-esp-decrypt-post", + .name = "dpdk-esp4-decrypt-post", .vector_size = sizeof (u32), .format_trace = format_esp_decrypt_post_trace, .type = VLIB_NODE_TYPE_INTERNAL, @@ -680,7 +683,7 @@ dpdk_esp6_decrypt_post_node_fn (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (dpdk_esp6_decrypt_post_node) = { .function = dpdk_esp6_decrypt_post_node_fn, - .name = "dpdk6-esp-decrypt-post", + .name = "dpdk-esp6-decrypt-post", .vector_size = sizeof (u32), .format_trace = format_esp_decrypt_post_trace, .type = VLIB_NODE_TYPE_INTERNAL, diff --git a/src/plugins/dpdk/ipsec/esp_encrypt.c b/src/plugins/dpdk/ipsec/esp_encrypt.c index 6be8e97b7c5..af8cc46b946 100644 --- a/src/plugins/dpdk/ipsec/esp_encrypt.c +++ b/src/plugins/dpdk/ipsec/esp_encrypt.c @@ -578,7 +578,7 @@ dpdk_esp4_encrypt_node_fn (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (dpdk_esp4_encrypt_node) = { .function = dpdk_esp4_encrypt_node_fn, - .name = "dpdk4-esp-encrypt", + .name = "dpdk-esp4-encrypt", .flags = VLIB_NODE_FLAG_IS_OUTPUT, .vector_size = sizeof (u32), .format_trace = format_esp_encrypt_trace, @@ -606,7 +606,7 @@ dpdk_esp6_encrypt_node_fn (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (dpdk_esp6_encrypt_node) = { .function = dpdk_esp6_encrypt_node_fn, - .name = "dpdk6-esp-encrypt", + .name = "dpdk-esp6-encrypt", .flags = VLIB_NODE_FLAG_IS_OUTPUT, .vector_size = sizeof (u32), .format_trace = format_esp_encrypt_trace, diff --git a/src/plugins/dpdk/ipsec/ipsec.h b/src/plugins/dpdk/ipsec/ipsec.h index dc11dfc2c14..7d7ba564544 100644 --- a/src/plugins/dpdk/ipsec/ipsec.h +++ b/src/plugins/dpdk/ipsec/ipsec.h @@ -35,7 +35,8 @@ _(IP4_LOOKUP, "ip4-lookup") \ _(IP6_LOOKUP, "ip6-lookup") \ _(INTERFACE_OUTPUT, "interface-output") \ - _(DECRYPT_POST, "dpdk-esp-decrypt-post") + _(DECRYPT4_POST, "dpdk-esp4-decrypt-post") \ + _(DECRYPT6_POST, "dpdk-esp6-decrypt-post") typedef enum { diff --git a/src/vnet/ipsec-gre/interface.c b/src/vnet/ipsec-gre/interface.c index 4faf66ddde8..7dc8301e96a 100644 --- a/src/vnet/ipsec-gre/interface.c +++ b/src/vnet/ipsec-gre/interface.c @@ -186,7 +186,7 @@ vnet_ipsec_gre_add_del_tunnel (vnet_ipsec_gre_add_del_tunnel_args_t * a, hash_set (igm->tunnel_by_key, key, t - igm->tunnels); slot = vlib_node_add_named_next_with_slot - (vnm->vlib_main, hi->tx_node_index, "esp-encrypt", + (vnm->vlib_main, hi->tx_node_index, "esp4-encrypt", IPSEC_GRE_OUTPUT_NEXT_ESP_ENCRYPT); ASSERT (slot == IPSEC_GRE_OUTPUT_NEXT_ESP_ENCRYPT); |