Move pcap rx/tx trace code out of the dpdk plugin

Moved code to the ethernet input node, and the interface output
path(s). Since we no longer skip ethernet-input, there's no reason
for device drivers to know anything about pcap rx tracing, etc.

Change-Id: I08d32fb1b90cbee1bd4f609837d533e047b36fa4
Signed-off-by: Dave Barach <dave@barachs.net>

1 files changed, 16 insertions, 0 deletions

diff --git a/src/vlib/main.h b/src/vlib/main.h
index 4192c3f2720..2c5bb45417f 100644
--- a/src/vlib/main.h
+++ b/src/vlib/main.h
@@ -58,6 +58,13 @@
 #define VLIB_ELOG_MAIN_LOOP 0
 #endif
 
+typedef struct
+{
+  int pcap_enable;
+  u32 pcap_sw_if_index;
+  pcap_main_t pcap_main;
+} vnet_pcap_t;
+
 typedef struct vlib_main_t
 {
   CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
@@ -138,6 +145,15 @@ typedef struct vlib_main_t
   uword dispatch_pcap_enable;
   u8 *pcap_buffer;
 
+  /* pcap rx / tx tracing */
+  vnet_pcap_t pcap[VLIB_N_RX_TX];
+
+  int pcap_enable;
+  pcap_main_t pcap_main;
+  u8 *pcap_filename;
+  u32 pcap_sw_if_index;
+  u32 pcap_pkts_to_capture;
+
   /* Error handling. */
   vlib_error_main_t error_main;