diff options
| -rw-r--r-- | src/vlib/buffer_funcs.h | 2 | ||||
| -rw-r--r-- | src/vlib/punt_node.c | 4 | ||||
| -rw-r--r-- | src/vnet/bier/bier_lookup.c | 3 | ||||
| -rw-r--r-- | src/vnet/dhcp/dhcp4_proxy_node.c | 1 | ||||
| -rw-r--r-- | src/vnet/dhcp/dhcp6_proxy_node.c | 1 | ||||
| -rw-r--r-- | src/vnet/dpo/replicate_dpo.c | 5 | ||||
| -rw-r--r-- | src/vnet/l2/l2_flood.c | 6 |
7 files changed, 3 insertions, 19 deletions
diff --git a/src/vlib/buffer_funcs.h b/src/vlib/buffer_funcs.h index bb090f2c195..7480326ee3d 100644 --- a/src/vlib/buffer_funcs.h +++ b/src/vlib/buffer_funcs.h @@ -992,6 +992,7 @@ vlib_buffer_copy (vlib_main_t * vm, vlib_buffer_t * b) d->current_data = s->current_data; d->current_length = s->current_length; d->flags = s->flags & flag_mask; + d->trace_handle = s->trace_handle; d->total_length_not_including_first_buffer = s->total_length_not_including_first_buffer; clib_memcpy_fast (d->opaque, s->opaque, sizeof (s->opaque)); @@ -1138,6 +1139,7 @@ vlib_buffer_clone_256 (vlib_main_t * vm, u32 src_buffer, u32 * buffers, } d->flags = (s->flags & VLIB_BUFFER_COPY_CLONE_FLAGS_MASK) | VLIB_BUFFER_NEXT_PRESENT; + d->trace_handle = s->trace_handle; clib_memcpy_fast (d->opaque, s->opaque, sizeof (s->opaque)); clib_memcpy_fast (d->opaque2, s->opaque2, sizeof (s->opaque2)); clib_memcpy_fast (vlib_buffer_get_current (d), diff --git a/src/vlib/punt_node.c b/src/vlib/punt_node.c index b0546ac6ae8..e341e4007cc 100644 --- a/src/vlib/punt_node.c +++ b/src/vlib/punt_node.c @@ -109,10 +109,6 @@ punt_replicate (vlib_main_t * vm, punt_trace_t *t; c0 = vlib_get_buffer (vm, ci0); - - if (c0 != b0) - vlib_buffer_copy_trace_flag (vm, b0, ci0); - t = vlib_add_trace (vm, node, c0, sizeof (*t)); t->pt_reason = pr0; } diff --git a/src/vnet/bier/bier_lookup.c b/src/vnet/bier/bier_lookup.c index ec75efb9a1d..a9fab9c80f1 100644 --- a/src/vnet/bier/bier_lookup.c +++ b/src/vnet/bier/bier_lookup.c @@ -250,9 +250,6 @@ bier_lookup (vlib_main_t * vm, { bier_lookup_trace_t *tr; - if (c0 != b0) - vlib_buffer_copy_trace_flag (vm, b0, ci0); - tr = vlib_add_trace (vm, node, c0, sizeof (*tr)); tr->bt_index = bti0; tr->bfm_index = blm->blm_fmasks[thread_index][clone]; diff --git a/src/vnet/dhcp/dhcp4_proxy_node.c b/src/vnet/dhcp/dhcp4_proxy_node.c index 8a517080eae..3576f0cbf35 100644 --- a/src/vnet/dhcp/dhcp4_proxy_node.c +++ b/src/vnet/dhcp/dhcp4_proxy_node.c @@ -385,7 +385,6 @@ dhcp_proxy_to_server_input (vlib_main_t * vm, { dhcp_proxy_trace_t *tr; - vlib_buffer_copy_trace_flag (vm, b0, ci0); tr = vlib_add_trace (vm, node, c0, sizeof (*tr)); tr->which = 0; /* to server */ tr->error = error0; diff --git a/src/vnet/dhcp/dhcp6_proxy_node.c b/src/vnet/dhcp/dhcp6_proxy_node.c index a253fa1959f..174548f24eb 100644 --- a/src/vnet/dhcp/dhcp6_proxy_node.c +++ b/src/vnet/dhcp/dhcp6_proxy_node.c @@ -460,7 +460,6 @@ dhcpv6_proxy_to_server_input (vlib_main_t * vm, { dhcpv6_proxy_trace_t *tr; - vlib_buffer_copy_trace_flag (vm, b0, ci0); tr = vlib_add_trace (vm, node, c0, sizeof (*tr)); tr->which = 0; /* to server */ tr->error = error0; diff --git a/src/vnet/dpo/replicate_dpo.c b/src/vnet/dpo/replicate_dpo.c index 69e367aa368..998a729dcd2 100644 --- a/src/vnet/dpo/replicate_dpo.c +++ b/src/vnet/dpo/replicate_dpo.c @@ -789,10 +789,7 @@ replicate_inline (vlib_main_t * vm, replicate_trace_t *t; if (c0 != b0) - { - vlib_buffer_copy_trace_flag (vm, b0, ci0); - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (c0); - } + VLIB_BUFFER_TRACE_TRAJECTORY_INIT (c0); t = vlib_add_trace (vm, node, c0, sizeof (*t)); t->rep_index = repi0; t->dpo = *dpo0; diff --git a/src/vnet/l2/l2_flood.c b/src/vnet/l2/l2_flood.c index 1bc528138d7..8d34233b520 100644 --- a/src/vnet/l2/l2_flood.c +++ b/src/vnet/l2/l2_flood.c @@ -250,9 +250,6 @@ VLIB_NODE_FN (l2flood_node) (vlib_main_t * vm, ethernet_header_t *h0; l2flood_trace_t *t; - if (c0 != b0) - vlib_buffer_copy_trace_flag (vm, b0, ci0); - t = vlib_add_trace (vm, node, c0, sizeof (*t)); h0 = vlib_buffer_get_current (c0); t->sw_if_index = sw_if_index0; @@ -301,9 +298,6 @@ VLIB_NODE_FN (l2flood_node) (vlib_main_t * vm, ethernet_header_t *h0; l2flood_trace_t *t; - if (c0 != b0) - vlib_buffer_copy_trace_flag (vm, b0, ci0); - t = vlib_add_trace (vm, node, c0, sizeof (*t)); h0 = vlib_buffer_get_current (c0); t->sw_if_index = sw_if_index0; |