#include <vnet/ipsec/ipsec.h>
#include <vnet/ipsec/esp.h>
#include <vnet/ipsec/ah.h>
+#include <vnet/ipsec/ipsec_io.h>
-#define foreach_ipsec_input_error \
- _(RX_PKTS, "IPSEC pkts received") \
- _(DECRYPTION_FAILED, "IPSEC decryption failed")
+#define foreach_ipsec_input_error \
+_(RX_PKTS, "IPSEC pkts received") \
+_(RX_MATCH_PKTS, "IPSEC pkts matched")
typedef enum
{
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
ipsec_input_trace_t *t = va_arg (*args, ipsec_input_trace_t *);
- s = format (s, "%U: sa_id %u spd %u policy %d spi %u seq %u",
+ s = format (s, "%U: sa_id %u spd %u policy %d spi %u (0x%08x) seq %u",
format_ip_protocol, t->proto, t->sa_id,
- t->spd, t->policy_index, t->spi, t->seq);
+ t->spd, t->policy_index, t->spi, t->spi, t->seq);
return s;
}
if (spi != s->spi)
continue;
- if (s->is_tunnel)
+ if (ipsec_sa_is_set_IS_TUNNEL (s))
{
if (da != clib_net_to_host_u32 (s->tunnel_dst_addr.ip4.as_u32))
continue;
if (spi != s->spi)
continue;
- if (s->is_tunnel)
+ if (ipsec_sa_is_set_IS_TUNNEL (s))
{
if (!ip6_address_is_equal (sa, &s->tunnel_src_addr.ip6))
continue;
return 0;
}
-static vlib_node_registration_t ipsec4_input_node;
+extern vlib_node_registration_t ipsec4_input_node;
VLIB_NODE_FN (ipsec4_input_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
{
u32 n_left_from, *from, next_index, *to_next, thread_index;
ipsec_main_t *im = &ipsec_main;
+ u32 ipsec_unprocessed = 0;
+ u32 ipsec_matched = 0;
from = vlib_frame_vector_args (from_frame);
n_left_from = from_frame->n_vectors;
ip4_ipsec_config_t *c0;
ipsec_spd_t *spd0;
ipsec_policy_t *p0 = 0;
+ u8 has_space0;
bi0 = to_next[0] = from[0];
from += 1;
esp0 =
(esp_header_t *) ((u8 *) esp0 + sizeof (udp_header_t));
}
- /* FIXME TODO missing check whether there is enough data inside
- * IP/UDP to contain ESP header & stuff ? */
+
p0 = ipsec_input_protect_policy_match (spd0,
clib_net_to_host_u32
(ip0->src_address.
clib_net_to_host_u32
(esp0->spi));
- if (PREDICT_TRUE (p0 != NULL))
+ has_space0 =
+ vlib_buffer_has_space (b0,
+ (clib_address_t) (esp0 + 1) -
+ (clib_address_t) ip0);
+
+ if (PREDICT_TRUE ((p0 != NULL) & (has_space0)))
{
+ ipsec_matched += 1;
+
pi0 = p0 - im->policies;
vlib_increment_combined_counter
(&ipsec_spd_policy_counters,
clib_net_to_host_u16 (ip0->length));
vnet_buffer (b0)->ipsec.sad_index = p0->sa_index;
- vnet_buffer (b0)->ipsec.flags = 0;
next0 = im->esp4_decrypt_next_index;
vlib_buffer_advance (b0, ((u8 *) esp0 - (u8 *) ip0));
goto trace0;
}
else
{
+ p0 = 0;
pi0 = ~0;
};
vlib_add_trace (vm, node, b0, sizeof (*tr));
tr->proto = ip0->protocol;
- if (p0)
- tr->sa_id = p0->sa_id;
- tr->spi = clib_net_to_host_u32 (esp0->spi);
- tr->seq = clib_net_to_host_u32 (esp0->seq);
+ tr->sa_id = p0 ? p0->sa_id : ~0;
+ tr->spi =
+ has_space0 ? clib_net_to_host_u32 (esp0->spi) : ~0;
+ tr->seq =
+ has_space0 ? clib_net_to_host_u32 (esp0->seq) : ~0;
tr->spd = spd0->id;
tr->policy_index = pi0;
}
}
-
- if (PREDICT_TRUE (ip0->protocol == IP_PROTOCOL_IPSEC_AH))
+ else if (ip0->protocol == IP_PROTOCOL_IPSEC_AH)
{
ah0 = (ah_header_t *) ((u8 *) ip0 + ip4_header_bytes (ip0));
p0 = ipsec_input_protect_policy_match (spd0,
clib_net_to_host_u32
(ah0->spi));
- if (PREDICT_TRUE (p0 != 0))
+ has_space0 =
+ vlib_buffer_has_space (b0,
+ (clib_address_t) (ah0 + 1) -
+ (clib_address_t) ip0);
+
+ if (PREDICT_TRUE ((p0 != NULL) & (has_space0)))
{
+ ipsec_matched += 1;
+
pi0 = p0 - im->policies;
vlib_increment_combined_counter
(&ipsec_spd_policy_counters,
thread_index, pi0, 1,
clib_net_to_host_u16 (ip0->length));
+
vnet_buffer (b0)->ipsec.sad_index = p0->sa_index;
- vnet_buffer (b0)->ipsec.flags = 0;
next0 = im->ah4_decrypt_next_index;
goto trace1;
}
else
{
+ p0 = 0;
pi0 = ~0;
}
/* FIXME bypass and discard */
vlib_add_trace (vm, node, b0, sizeof (*tr));
tr->proto = ip0->protocol;
- if (p0)
- tr->sa_id = p0->sa_id;
- tr->spi = clib_net_to_host_u32 (ah0->spi);
- tr->seq = clib_net_to_host_u32 (ah0->seq_no);
+ tr->sa_id = p0 ? p0->sa_id : ~0;
+ tr->spi = has_space0 ? clib_net_to_host_u32 (ah0->spi) : ~0;
+ tr->seq =
+ has_space0 ? clib_net_to_host_u32 (ah0->seq_no) : ~0;
tr->spd = spd0->id;
tr->policy_index = pi0;
}
}
+ else
+ {
+ ipsec_unprocessed += 1;
+ }
vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
to_next, n_left_to_next, bi0,
}
vlib_put_next_frame (vm, node, next_index, n_left_to_next);
}
+
vlib_node_increment_counter (vm, ipsec4_input_node.index,
IPSEC_INPUT_ERROR_RX_PKTS,
- from_frame->n_vectors);
+ from_frame->n_vectors - ipsec_unprocessed);
+ vlib_node_increment_counter (vm, ipsec4_input_node.index,
+ IPSEC_INPUT_ERROR_RX_MATCH_PKTS,
+ ipsec_matched);
return from_frame->n_vectors;
}
/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ipsec4_input_node,static) = {
+VLIB_REGISTER_NODE (ipsec4_input_node) = {
.name = "ipsec4-input-feature",
.vector_size = sizeof (u32),
.format_trace = format_ipsec_input_trace,
.type = VLIB_NODE_TYPE_INTERNAL,
-
.n_errors = ARRAY_LEN(ipsec_input_error_strings),
.error_strings = ipsec_input_error_strings,
-
.n_next_nodes = IPSEC_INPUT_N_NEXT,
.next_nodes = {
#define _(s,n) [IPSEC_INPUT_NEXT_##s] = n,
};
/* *INDENT-ON* */
-static vlib_node_registration_t ipsec6_input_node;
+extern vlib_node_registration_t ipsec6_input_node;
VLIB_NODE_FN (ipsec6_input_node) (vlib_main_t * vm,
{
u32 n_left_from, *from, next_index, *to_next, thread_index;
ipsec_main_t *im = &ipsec_main;
+ u32 ipsec_unprocessed = 0;
+ u32 ipsec_matched = 0;
from = vlib_frame_vector_args (from_frame);
n_left_from = from_frame->n_vectors;
if (PREDICT_TRUE (p0 != 0))
{
+ ipsec_matched += 1;
+
pi0 = p0 - im->policies;
vlib_increment_combined_counter
(&ipsec_spd_policy_counters,
thread_index, pi0, 1,
clib_net_to_host_u16 (ip0->payload_length) +
header_size);
+
vnet_buffer (b0)->ipsec.sad_index = p0->sa_index;
- vnet_buffer (b0)->ipsec.flags = 0;
next0 = im->esp6_decrypt_next_index;
vlib_buffer_advance (b0, header_size);
goto trace0;
if (PREDICT_TRUE (p0 != 0))
{
+ ipsec_matched += 1;
pi0 = p0 - im->policies;
vlib_increment_combined_counter
(&ipsec_spd_policy_counters,
thread_index, pi0, 1,
clib_net_to_host_u16 (ip0->payload_length) +
header_size);
+
vnet_buffer (b0)->ipsec.sad_index = p0->sa_index;
- vnet_buffer (b0)->ipsec.flags = 0;
next0 = im->ah6_decrypt_next_index;
goto trace0;
}
pi0 = ~0;
}
}
+ else
+ {
+ ipsec_unprocessed += 1;
+ }
trace0:
if (PREDICT_FALSE (node->flags & VLIB_NODE_FLAG_TRACE) &&
}
vlib_put_next_frame (vm, node, next_index, n_left_to_next);
}
+
vlib_node_increment_counter (vm, ipsec6_input_node.index,
IPSEC_INPUT_ERROR_RX_PKTS,
- from_frame->n_vectors);
+ from_frame->n_vectors - ipsec_unprocessed);
+
+ vlib_node_increment_counter (vm, ipsec6_input_node.index,
+ IPSEC_INPUT_ERROR_RX_MATCH_PKTS,
+ ipsec_matched);
return from_frame->n_vectors;
}
/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ipsec6_input_node,static) = {
+VLIB_REGISTER_NODE (ipsec6_input_node) = {
.name = "ipsec6-input-feature",
.vector_size = sizeof (u32),
.format_trace = format_ipsec_input_trace,
.type = VLIB_NODE_TYPE_INTERNAL,
-
.n_errors = ARRAY_LEN(ipsec_input_error_strings),
.error_strings = ipsec_input_error_strings,
-
- .sibling_of = "ipsec4-input-feature",
+ .n_next_nodes = IPSEC_INPUT_N_NEXT,
+ .next_nodes = {
+#define _(s,n) [IPSEC_INPUT_NEXT_##s] = n,
+ foreach_ipsec_input_next
+#undef _
+ },
};
/* *INDENT-ON* */
Code Review / vpp.git / blobdiff