diff options
| author |   Kingwel Xie <kingwel.xie@ericsson.com> | 2019-03-20 21:47:17 -0400 |
|---|---|---|
| committer |   Ole Trøan <otroan@employees.org> | 2019-03-21 11:29:24 +0000 |
| commit | 27431dde9576e9c267af3d92b8f092467559e4e1 (patch) | |
| tree | 2c91022ad016e07d933e2cb6918d9e9edc9141c3 | |
| parent | 1ba5bc8d888d0164dd6e38857cbed09ab7ce1d8b (diff) | |
icmp: bug fix of buffer->error
Recent changes in icmp4/6 choose to free the original
buffer, and make a copy for sending icmp reply back.
However, buffer->error will be ignored when the buffer
is freed unconditionally.
A quick fix can be moving the counter increment code to icmp,
but I prefert to enqueue all buffers to 'error-drop' so that
they can be handled in a batch
rebase, using vlib_buffer_enqueue_to_single_next
Change-Id: I9f3028b55f1d5f634763e2410cd91e17f368195e
Signed-off-by: Kingwel Xie <kingwel.xie@ericsson.com>
| -rw-r--r-- | src/vnet/ip/icmp4.c | 10 | ||||
| -rw-r--r-- | src/vnet/ip/icmp6.c | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/src/vnet/ip/icmp4.c b/src/vnet/ip/icmp4.c index ce81dc04f65..500aa6d9c16 100644 --- a/src/vnet/ip/icmp4.c +++ b/src/vnet/ip/icmp4.c @@ -495,7 +495,6 @@ ip4_icmp_error (vlib_main_t * vm, org_p0 = vlib_get_buffer (vm, org_pi0); p0 = vlib_buffer_copy_no_chain (vm, org_p0, &pi0); - vlib_buffer_free_one (vm, org_pi0); if (!p0 || pi0 == ~0) /* Out of buffers */ continue; @@ -575,6 +574,15 @@ ip4_icmp_error (vlib_main_t * vm, vlib_put_next_frame (vm, node, next_index, n_left_to_next); } + /* + * push the original buffers to error-drop, so that + * they can get the error counters handled, then freed + */ + vlib_buffer_enqueue_to_single_next (vm, node, + vlib_frame_vector_args (frame), + IP4_ICMP_ERROR_NEXT_DROP, + frame->n_vectors); + return frame->n_vectors; } diff --git a/src/vnet/ip/icmp6.c b/src/vnet/ip/icmp6.c index ff83a0cb946..9d283ff43f5 100644 --- a/src/vnet/ip/icmp6.c +++ b/src/vnet/ip/icmp6.c @@ -512,7 +512,6 @@ ip6_icmp_error (vlib_main_t * vm, org_p0 = vlib_get_buffer (vm, org_pi0); p0 = vlib_buffer_copy_no_chain (vm, org_p0, &pi0); - vlib_buffer_free_one (vm, org_pi0); if (!p0 || pi0 == ~0) /* Out of buffers */ continue; @@ -588,6 +587,15 @@ ip6_icmp_error (vlib_main_t * vm, vlib_put_next_frame (vm, node, next_index, n_left_to_next); } + /* + * push the original buffers to error-drop, so that + * they can get the error counters handled, then freed + */ + vlib_buffer_enqueue_to_single_next (vm, node, + vlib_frame_vector_args (frame), + IP6_ICMP_ERROR_NEXT_DROP, + frame->n_vectors); + return frame->n_vectors; } |