From 33909777c63712ca397165cd92e7cc62208eb5c8 Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Mon, 23 Sep 2019 10:27:27 -0400 Subject: 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 Change-Id: Id15d41a596712968c0714cef1bd2cd5bc9cbdd55 --- src/vlib/main.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/vlib/main.h') diff --git a/src/vlib/main.h b/src/vlib/main.h index 88ce98bb405..2b50b4e4712 100644 --- a/src/vlib/main.h +++ b/src/vlib/main.h @@ -60,7 +60,14 @@ typedef struct { - int pcap_enable; + /* Trace RX pkts */ + u8 pcap_rx_enable; + /* Trace TX pkts */ + u8 pcap_tx_enable; + /* Trace drop pkts */ + u8 pcap_drop_enable; + u8 pad1; + u32 max_bytes_per_pkt; u32 pcap_sw_if_index; pcap_main_t pcap_main; u32 filter_classify_table_index; @@ -153,7 +160,7 @@ typedef struct vlib_main_t u8 *pcap_buffer; /* pcap rx / tx tracing */ - vnet_pcap_t pcap[VLIB_N_RX_TX]; + vnet_pcap_t pcap; /* Error handling. */ vlib_error_main_t error_main; -- cgit 1.2.3-korg