ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tracenode: fix pcap capture if packet is also traced

Browse Source 
Type: fix

Change-Id: Ifc259d87a086f686ce273f543632bd122b506c31
Signed-off-by: Benoît Ganne <bganne@cisco.com>
This commit is contained in:
Benoît Ganne
2024-09-03 18:01:05 +02:00
committed by Beno�t Ganne
parent 661fb34a90
commit f611870e8d
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/tracenode/node.c
View File

@ -55,23 +55,19 @@ tracenode_inline (vlib_main_t *vm, vlib_node_runtime_t *node,
/* enqueue b0 to the current next frame */ /* enqueue b0 to the current next frame */
vnet_feature_next_u16 (next, b[0]); vnet_feature_next_u16 (next, b[0]);
/* buffer already traced */
if (PREDICT_FALSE (b[0]->flags & VLIB_BUFFER_IS_TRACED))
goto skip;
if (is_pcap && vnet_is_packet_pcaped (pp, b[0], ~0)) if (is_pcap && vnet_is_packet_pcaped (pp, b[0], ~0))
{ {
pcap_add_buffer (&pp->pcap_main, vm, from0[0], pcap_add_buffer (&pp->pcap_main, vm, from0[0],
pp->max_bytes_per_pkt); pp->max_bytes_per_pkt);
} }
else if (!is_pcap && vlib_trace_buffer (vm, node, next[0], b[0], else if (!is_pcap && !(b[0]->flags & VLIB_BUFFER_IS_TRACED) &&
1 /* follow_chain */)) vlib_trace_buffer (vm, node, next[0], b[0],
1 /* follow_chain */))
{ {
tracenode_trace_t *tr = vlib_add_trace (vm, node, b[0], sizeof *tr); tracenode_trace_t *tr = vlib_add_trace (vm, node, b[0], sizeof *tr);
tr->sw_if_index = vnet_buffer (b[0])->sw_if_index[VLIB_RX]; tr->sw_if_index = vnet_buffer (b[0])->sw_if_index[VLIB_RX];
} }
skip:
b++; b++;
from0++; from0++;
next++; next++;