X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fipsec_tun_in.c;h=e6ad67b433a46208aee0ab7a4b00b522a7ca0280;hb=02950406c49a743f631395ed52073921744e1afd;hp=df6d9278303b8679594c97cf61000401691a4201;hpb=719beb709818b70a1fd65f3c2a625d955678ceb6;p=vpp.git diff --git a/src/vnet/ipsec/ipsec_tun_in.c b/src/vnet/ipsec/ipsec_tun_in.c index df6d9278303..e6ad67b433a 100644 --- a/src/vnet/ipsec/ipsec_tun_in.c +++ b/src/vnet/ipsec/ipsec_tun_in.c @@ -32,6 +32,8 @@ _(DISABLED, "ipsec packets received on disabled interface") \ _(NO_TUNNEL, "no matching tunnel") \ _(TUNNEL_MISMATCH, "SPI-tunnel mismatch") \ + _(NAT_KEEPALIVE, "NAT Keepalive") \ + _(TOO_SHORT, "Too Short") \ _(SPI_0, "SPI 0") static char *ipsec_tun_protect_input_error_strings[] = { @@ -59,8 +61,14 @@ typedef enum ipsec_tun_next_t_ typedef struct { - u32 spi; + union + { + ipsec4_tunnel_key_t key4; + ipsec6_tunnel_key_t key6; + }; + u8 is_ip6; u32 seq; + u32 sa_index; } ipsec_tun_protect_input_trace_t; static u8 * @@ -71,7 +79,12 @@ format_ipsec_tun_protect_input_trace (u8 * s, va_list * args) ipsec_tun_protect_input_trace_t *t = va_arg (*args, ipsec_tun_protect_input_trace_t *); - s = format (s, "IPSec: spi %u seq %u", t->spi, t->seq); + if (t->is_ip6) + s = format (s, "IPSec: %U seq %u sa %d", + format_ipsec6_tunnel_key, &t->key6, t->seq, t->sa_index); + else + s = format (s, "IPSec: %U seq %u sa %d", + format_ipsec4_tunnel_key, &t->key4, t->seq, t->sa_index); return s; } @@ -160,8 +173,10 @@ ipsec_tun_protect_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, ip4_header_t *ip40; ip6_header_t *ip60; esp_header_t *esp0; + u16 buf_rewind0; - ip40 = vlib_buffer_get_current (b[0]); + ip40 = + (ip4_header_t *) (b[0]->data + vnet_buffer (b[0])->l3_hdr_offset); if (is_ip6) { @@ -178,11 +193,12 @@ ipsec_tun_protect_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, (esp_header_t *) ((u8 *) ip40 + ip4_header_bytes (ip40) + sizeof (udp_header_t)); hdr_sz0 = 0; + buf_rewind0 = ip4_header_bytes (ip40) + sizeof (udp_header_t); } else { esp0 = (esp_header_t *) ((u8 *) ip40 + ip4_header_bytes (ip40)); - hdr_sz0 = ip4_header_bytes (ip40); + buf_rewind0 = hdr_sz0 = ip4_header_bytes (ip40); } } @@ -191,6 +207,19 @@ ipsec_tun_protect_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_buffer_advance (b[0], hdr_sz0); len0 = vlib_buffer_length_in_chain (vm, b[0]); + if (len0 < sizeof (esp_header_t)) + { + if (esp0->spi_bytes[0] == 0xff) + b[0]->error = + node->errors[IPSEC_TUN_PROTECT_INPUT_ERROR_NAT_KEEPALIVE]; + else + b[0]->error = + node->errors[IPSEC_TUN_PROTECT_INPUT_ERROR_TOO_SHORT]; + + next[0] = IPSEC_INPUT_NEXT_DROP; + goto trace00; + } + if (is_ip6) { key60.remote_ip = ip60->src_address; @@ -219,7 +248,7 @@ ipsec_tun_protect_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, } else { - key40.remote_ip = ip40->src_address.as_u32; + key40.remote_ip = ip40->src_address; key40.spi = esp0->spi; if (key40.as_u64 == last_key4.as_u64) @@ -238,6 +267,7 @@ ipsec_tun_protect_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, else { next[0] = ipsec_ip4_if_no_tunnel (node, b[0], esp0, ip40); + vlib_buffer_advance (b[0], -buf_rewind0); n_no_tunnel++; goto trace00; } @@ -281,58 +311,6 @@ ipsec_tun_protect_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, n_bytes = len0; } - /* - * compare the packet's outer IP headers to that of the tunnels - */ - if (is_ip6) - { - if (PREDICT_FALSE - (!ip46_address_is_equal_v6 - (&itp0->itp_crypto.dst, &ip60->src_address) - || !ip46_address_is_equal_v6 (&itp0->itp_crypto.src, - &ip60->dst_address))) - { - b[0]->error = - node->errors - [IPSEC_TUN_PROTECT_INPUT_ERROR_TUNNEL_MISMATCH]; - next[0] = IPSEC_INPUT_NEXT_DROP; - goto trace00; - } - } - else - { - if (PREDICT_FALSE - (!ip46_address_is_equal_v4 - (&itp0->itp_crypto.dst, &ip40->src_address) - || !ip46_address_is_equal_v4 (&itp0->itp_crypto.src, - &ip40->dst_address))) - { - b[0]->error = - node->errors - [IPSEC_TUN_PROTECT_INPUT_ERROR_TUNNEL_MISMATCH]; - next[0] = IPSEC_INPUT_NEXT_DROP; - goto trace00; - } - } - - /* - * There are two encap possibilities - * 1) the tunnel and ths SA are prodiving encap, i.e. it's - * MAC | SA-IP | TUN-IP | ESP | PAYLOAD - * implying the SA is in tunnel mode (on a tunnel interface) - * 2) only the tunnel provides encap - * MAC | TUN-IP | ESP | PAYLOAD - * implying the SA is in transport mode. - * - * For 2) we need only strip the tunnel encap and we're good. - * since the tunnel and crypto ecnap (int the tun=protect - * object) are the same and we verified above that these match - * for 1) we need to strip the SA-IP outer headers, to - * reveal the tunnel IP and then check that this matches - * the configured tunnel. this we can;t do here since it - * involves a lookup in the per-tunnel-type DB - so ship - * the packet to the tunnel-types provided node to do that - */ next[0] = IPSEC_TUN_PROTECT_NEXT_DECRYPT; } trace00: @@ -342,8 +320,14 @@ ipsec_tun_protect_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, { ipsec_tun_protect_input_trace_t *tr = vlib_add_trace (vm, node, b[0], sizeof (*tr)); - tr->spi = clib_host_to_net_u32 (esp0->spi); - tr->seq = clib_host_to_net_u32 (esp0->seq); + if (is_ip6) + clib_memcpy (&tr->key6, &key60, sizeof (tr->key6)); + else + clib_memcpy (&tr->key4, &key40, sizeof (tr->key4)); + tr->is_ip6 = is_ip6; + tr->seq = (len0 >= sizeof (*esp0) ? + clib_host_to_net_u32 (esp0->seq) : ~0); + tr->sa_index = vnet_buffer (b[0])->ipsec.sad_index; } }