summaryrefslogtreecommitdiffstats
path: root/src/vnet/ethernet/node.c
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2019-09-23 10:27:27 -0400
committerFlorin Coras <florin.coras@gmail.com>2019-09-23 16:20:06 +0000
commit33909777c63712ca397165cd92e7cc62208eb5c8 (patch)
treeb89669157d6f2a181d67eef5c7beb172fbf37d8c /src/vnet/ethernet/node.c
parent44ca60ecdba866160bebbc6c1eb983674819d429 (diff)
misc: unify pcap rx / tx / drop trace
Use a single vnet_pcap_t in vlib_global_main, specifically to support unified tracing Update sphinx docs, doxygen tags Type: refactor Ticket: VPP-1776 Signed-off-by: Dave Barach <dave@barachs.net> Change-Id: Id15d41a596712968c0714cef1bd2cd5bc9cbdd55
Diffstat (limited to 'src/vnet/ethernet/node.c')
-rwxr-xr-xsrc/vnet/ethernet/node.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/vnet/ethernet/node.c b/src/vnet/ethernet/node.c
index fb706551719..ee14e40d881 100755
--- a/src/vnet/ethernet/node.c
+++ b/src/vnet/ethernet/node.c
@@ -998,10 +998,11 @@ ethernet_input_trace (vlib_main_t * vm, vlib_node_runtime_t * node,
}
/* rx pcap capture if enabled */
- if (PREDICT_FALSE (vlib_global_main.pcap[VLIB_RX].pcap_enable))
+ if (PREDICT_FALSE (vlib_global_main.pcap.pcap_rx_enable))
{
u32 bi0;
vnet_main_t *vnm = vnet_get_main ();
+ vnet_pcap_t *pp = &vlib_global_main.pcap;
from = vlib_frame_vector_args (from_frame);
n_left = from_frame->n_vectors;
@@ -1020,17 +1021,16 @@ ethernet_input_trace (vlib_main_t * vm, vlib_node_runtime_t * node,
(b0, vnm->classify_filter_table_indices[0],
0 /* full classify */ );
if (classify_filter_result)
- pcap_add_buffer (&vlib_global_main.pcap[VLIB_RX].pcap_main,
- vm, bi0, 512);
+ pcap_add_buffer (&pp->pcap_main, vm, bi0,
+ pp->max_bytes_per_pkt);
continue;
}
- if (vlib_global_main.pcap[VLIB_RX].pcap_sw_if_index == 0 ||
- vlib_global_main.pcap[VLIB_RX].pcap_sw_if_index
- == vnet_buffer (b0)->sw_if_index[VLIB_RX])
+ if (pp->pcap_sw_if_index == 0 ||
+ pp->pcap_sw_if_index == vnet_buffer (b0)->sw_if_index[VLIB_RX])
{
- pcap_add_buffer (&vlib_global_main.pcap[VLIB_RX].pcap_main, vm,
- bi0, 512);
+ pcap_add_buffer (&pp->pcap_main, vm, bi0,
+ pp->max_bytes_per_pkt);
}
}
}