summaryrefslogtreecommitdiffstats
path: root/src/vnet/interface.h
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2019-09-23 10:27:27 -0400
committerDamjan Marion <dmarion@me.com>2019-09-25 22:19:59 +0000
commit731312df93534d9695b2d22fc9071a860868f87d (patch)
tree76e30dfd15a341170cb886dabb0f8d5d58f31e37 /src/vnet/interface.h
parent2cf5b1a1ec8d959f1355974822deba35d6bfb04b (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 (cherry picked from commit 33909777c63712ca397165cd92e7cc62208eb5c8)
Diffstat (limited to 'src/vnet/interface.h')
-rw-r--r--src/vnet/interface.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/vnet/interface.h b/src/vnet/interface.h
index 0c273c6c7d2..00ed1f03151 100644
--- a/src/vnet/interface.h
+++ b/src/vnet/interface.h
@@ -843,12 +843,11 @@ typedef struct
vnet_hw_interface_nodes_t *deleted_hw_interface_nodes;
- /* pcap drop tracing */
- int drop_pcap_enable;
- pcap_main_t pcap_main;
- u8 *pcap_filename;
- u32 pcap_sw_if_index;
- u32 pcap_pkts_to_capture;
+ /*
+ * pcap drop tracing
+ * Only the drop filter hash lives here. See ../src/vlib/main.h for
+ * the rest of the variables.
+ */
uword *pcap_drop_filter_hash;
/* Buffer metadata format helper functions */
@@ -899,7 +898,10 @@ typedef struct
int enable;
int status;
u32 packets_to_capture;
- vlib_rx_or_tx_t rxtx;
+ u32 max_bytes_per_pkt;
+ u8 rx_enable;
+ u8 tx_enable;
+ u8 drop_enable;
u32 sw_if_index;
int filter;
} vnet_pcap_dispatch_trace_args_t;