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;
}
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,
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;
}
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;
}
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;
}
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;
}
/* *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,
};
/* *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,
/* *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,