commit a333795d1c425877645754a384af47755a80712e
author Neale Ranns <nranns@cisco.com> Mon Feb 18 06:20:46 2019 -0800
committer Damjan Marion <dmarion@me.com> Mon Feb 18 17:52:27 2019 +0000
tree 07299bd07786428d3a5b0654a64aeedddceb7e0c
parent e69e423743630b52e13db58c3f0229df8a46c07f

DHCP: trace flags copied from old to new not vice-versa

Change-Id: I6c13af7e97753da013cdd5b212302d008cbd616d
Signed-off-by: Neale Ranns <nranns@cisco.com>

src/vnet/dhcp/dhcp4_proxy_node.c

diff --git a/src/vnet/dhcp/dhcp4_proxy_node.c b/src/vnet/dhcp/dhcp4_proxy_node.c
index d5ddfdc..a331b17 100644
--- a/src/vnet/dhcp/dhcp4_proxy_node.c
+++ b/src/vnet/dhcp/dhcp4_proxy_node.c
@@ -351,7 +351,6 @@
 		  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_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;

src/vnet/dhcp/dhcp6_proxy_node.c

diff --git a/src/vnet/dhcp/dhcp6_proxy_node.c b/src/vnet/dhcp/dhcp6_proxy_node.c
index 3958af8..a199b7a 100644
--- a/src/vnet/dhcp/dhcp6_proxy_node.c
+++ b/src/vnet/dhcp/dhcp6_proxy_node.c
@@ -436,7 +436,6 @@
 		  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_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;