Don't use an pcap structures in pcapio.[ch].

Currently, pcapio is only used by dumpcap, which is only compiled
if there is pcap support. However, making pcapio independent from
libpcap allows it also to be used from text2pcap, which does not
rely on libpcap.

svn path=/trunk/; revision=46637

1 files changed, 12 insertions, 2 deletions

diff --git a/dumpcap.c b/dumpcap.c
index 95e54400ed..6df3a0d5f2 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -3982,9 +3982,19 @@ capture_loop_write_packet_cb(u_char *pcap_opts_p, const struct pcap_pkthdr *phdr
            If this fails, set "ld->go" to FALSE, to stop the capture, and set
            "ld->err" to the error. */
         if (global_capture_opts.use_pcapng) {
-            successful = libpcap_write_enhanced_packet_block(global_ld.pdh, phdr, pcap_opts->interface_id, ts_mul, pd, 0, &global_ld.bytes_written, &err);
+            successful = libpcap_write_enhanced_packet_block(global_ld.pdh,
+                                                             phdr->ts.tv_sec, phdr->ts.tv_usec,
+                                                             phdr->caplen, phdr->len,
+                                                             pcap_opts->interface_id,
+                                                             ts_mul,
+                                                             pd, 0,
+                                                             &global_ld.bytes_written, &err);
         } else {
-            successful = libpcap_write_packet(global_ld.pdh, phdr, pd, &global_ld.bytes_written, &err);
+            successful = libpcap_write_packet(global_ld.pdh,
+                                              phdr->ts.tv_sec, phdr->ts.tv_usec,
+                                              phdr->caplen, phdr->len,
+                                              pd,
+                                              &global_ld.bytes_written, &err);
         }
         if (!successful) {
             global_ld.go = FALSE;