Skip to content

fix exception punt for SPI=0 over UDP to work with vectors >=2 packets #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix exception punt for SPI=0 over UDP to work with vectors >=2 packets #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/vnet/ipsec/ipsec_if_in.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ ipsec_if_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
esp_header_t *esp0, *esp1;
u32 len0, len1;
u16 buf_adv0, buf_adv1;
u16 buf_rewind0, buf_rewind1;
u32 tid0, tid1;
ipsec_tunnel_if_t *t0, *t1;
ipsec4_tunnel_key_t key40, key41;
Expand Down Expand Up @@ -185,11 +186,12 @@ ipsec_if_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
(esp_header_t *) ((u8 *) ip40 + ip4_header_bytes (ip40) +
sizeof (udp_header_t));
buf_adv0 = 0;
buf_rewind0 = ip4_header_bytes (ip40) + sizeof (udp_header_t);
}
else
{
esp0 = (esp_header_t *) ((u8 *) ip40 + ip4_header_bytes (ip40));
buf_adv0 = ip4_header_bytes (ip40);
buf_rewind0 = buf_adv0 = ip4_header_bytes (ip40);
}
/* NAT UDP port 4500 case, don't advance any more */
if (ip41->protocol == IP_PROTOCOL_UDP)
Expand All @@ -198,11 +200,12 @@ ipsec_if_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
(esp_header_t *) ((u8 *) ip41 + ip4_header_bytes (ip41) +
sizeof (udp_header_t));
buf_adv1 = 0;
buf_rewind1 = ip4_header_bytes (ip41) + sizeof (udp_header_t);
}
else
{
esp1 = (esp_header_t *) ((u8 *) ip41 + ip4_header_bytes (ip41));
buf_adv1 = ip4_header_bytes (ip41);
buf_rewind1 = buf_adv1 = ip4_header_bytes (ip41);
}
}

Expand Down Expand Up @@ -262,7 +265,7 @@ ipsec_if_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
else
{
next[0] =
ipsec_ip4_if_no_tunnel (node, b[0], esp0, ip40, buf_adv0);
ipsec_ip4_if_no_tunnel (node, b[0], esp0, ip40, buf_rewind0);
n_no_tunnel++;
goto pkt1;
}
Expand Down Expand Up @@ -358,7 +361,7 @@ ipsec_if_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
else
{
next[1] =
ipsec_ip4_if_no_tunnel (node, b[1], esp1, ip41, buf_adv1);
ipsec_ip4_if_no_tunnel (node, b[1], esp1, ip41, buf_rewind1);
n_no_tunnel++;
goto trace1;
}
Expand Down