From a333795d1c425877645754a384af47755a80712e Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Mon, 18 Feb 2019 06:20:46 -0800 Subject: [PATCH] DHCP: trace flags copied from old to new not vice-versa Change-Id: I6c13af7e97753da013cdd5b212302d008cbd616d Signed-off-by: Neale Ranns --- src/vnet/dhcp/dhcp4_proxy_node.c | 2 +- src/vnet/dhcp/dhcp6_proxy_node.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vnet/dhcp/dhcp4_proxy_node.c b/src/vnet/dhcp/dhcp4_proxy_node.c index d5ddfdc86f2..a331b17e07e 100644 --- a/src/vnet/dhcp/dhcp4_proxy_node.c +++ b/src/vnet/dhcp/dhcp4_proxy_node.c @@ -351,7 +351,6 @@ dhcp_proxy_to_server_input (vlib_main_t * vm, u32 ci0; c0 = vlib_buffer_copy (vm, b0); - vlib_buffer_copy_trace_flag (vm, c0, bi0); VLIB_BUFFER_TRACE_TRAJECTORY_INIT (c0); ci0 = vlib_get_buffer_index (vm, c0); server = &proxy->dhcp_servers[ii]; @@ -379,6 +378,7 @@ 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 3958af86c20..a199b7a34e4 100644 --- a/src/vnet/dhcp/dhcp6_proxy_node.c +++ b/src/vnet/dhcp/dhcp6_proxy_node.c @@ -436,7 +436,6 @@ dhcpv6_proxy_to_server_input (vlib_main_t * vm, u32 ci0; c0 = vlib_buffer_copy (vm, b0); - vlib_buffer_copy_trace_flag (vm, c0, bi0); VLIB_BUFFER_TRACE_TRAJECTORY_INIT (c0); ci0 = vlib_get_buffer_index (vm, c0); server = &proxy->dhcp_servers[ii]; @@ -461,6 +460,7 @@ 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; -- 2.16.6