Have the frame_tvbuff.c routines not use the global cfile.

Have the routines that create them take a pointer to a struct
packet_provider_data, store that in the tvbuff data, and use it to get
the wtap from which packets are being read.

While we're at it, don't include globals.h in any header files, and
include it in source files iff the source file actually uses cfile.  Add
whatever includes that requires.

Change-Id: I9f1ee391f951dc427ff62c80f67aa4877a37c229
Reviewed-on: https://code.wireshark.org/review/24733
Reviewed-by: Guy Harris <guy@alum.mit.edu>

diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c
index 723449f701fb244809ad5c033b7d8b9b45378193..e8d6fcf10b240cb00f34b25a1f34a404dbb78891 100644 (file)
--- a/capchild/capture_sync.c
+++ b/capchild/capture_sync.c
@@ -75,7 +75,6 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 
-#include "globals.h"
 #include "file.h"
 
 #include "ui/capture.h"

diff --git a/epan/exported_pdu.h b/epan/exported_pdu.h
index cda931397e8d3a2910b87b329fc27a287056ccc0..95019c402b8f51d98f256dd783bb1f9932cb89ab 100644 (file)
--- a/epan/exported_pdu.h
+++ b/epan/exported_pdu.h
@@ -30,6 +30,9 @@
 
 #include <glib.h>
 
+#include <epan/tvbuff.h>
+#include <epan/packet_info.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */

diff --git a/epan/tap.h b/epan/tap.h
index edaaa314741547226648e40c678b10f6d42c9f1b..395bf19ce8d16ca74c0e1b084b0f6b034d5636d3 100644 (file)
--- a/epan/tap.h
+++ b/epan/tap.h
@@ -24,6 +24,7 @@
 #define __TAP_H__
 
 #include <epan/epan.h>
+#include <epan/packet_info.h>
 #include "ws_symbol_export.h"
 
 #ifdef __cplusplus

diff --git a/file.c b/file.c
index d0080c4802abac24e3784a07479358ef918348b1..438ca5508d8da399d06091f90016689d0ca2a95c 100644 (file)
--- a/file.c
+++ b/file.c
@@ -1103,7 +1103,9 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf,
   }
 
   /* Dissect the frame. */
-  epan_dissect_run_with_taps(edt, cf->cd_t, phdr, frame_tvbuff_new(fdata, buf), fdata, cinfo);
+  epan_dissect_run_with_taps(edt, cf->cd_t, phdr,
+                             frame_tvbuff_new(&cf->provider, fdata, buf),
+                             fdata, cinfo);
 
   /* If we don't have a display filter, set "passed_dfilter" to 1. */
   if (dfcode != NULL) {
@@ -1177,7 +1179,9 @@ read_packet(capture_file *cf, dfilter_t *dfcode, epan_dissect_t *edt,
 
     epan_dissect_init(&rf_edt, cf->epan, TRUE, FALSE);
     epan_dissect_prime_with_dfilter(&rf_edt, cf->rfcode);
-    epan_dissect_run(&rf_edt, cf->cd_t, phdr, frame_tvbuff_new(&fdlocal, buf), &fdlocal, NULL);
+    epan_dissect_run(&rf_edt, cf->cd_t, phdr,
+                     frame_tvbuff_new(&cf->provider, &fdlocal, buf),
+                     &fdlocal, NULL);
     passed = dfilter_apply_edt(cf->rfcode, &rf_edt);
     epan_dissect_cleanup(&rf_edt);
   }
@@ -2072,7 +2076,9 @@ retap_packet(capture_file *cf, frame_data *fdata,
 {
   retap_callback_args_t *args = (retap_callback_args_t *)argsp;
 
-  epan_dissect_run_with_taps(&args->edt, cf->cd_t, phdr, frame_tvbuff_new(fdata, pd), fdata, args->cinfo);
+  epan_dissect_run_with_taps(&args->edt, cf->cd_t, phdr,
+                             frame_tvbuff_new(&cf->provider, fdata, pd),
+                             fdata, args->cinfo);
   epan_dissect_reset(&args->edt);
 
   return TRUE;
@@ -2182,10 +2188,13 @@ print_packet(capture_file *cf, frame_data *fdata,
      information. */
   if (args->print_args->print_summary) {
     col_custom_prime_edt(&args->edt, &cf->cinfo);
-    epan_dissect_run(&args->edt, cf->cd_t, phdr, frame_tvbuff_new(fdata, pd), fdata, &cf->cinfo);
+    epan_dissect_run(&args->edt, cf->cd_t, phdr,
+                     frame_tvbuff_new(&cf->provider, fdata, pd),
+                     fdata, &cf->cinfo);
     epan_dissect_fill_in_columns(&args->edt, FALSE, TRUE);
   } else
-    epan_dissect_run(&args->edt, cf->cd_t, phdr, frame_tvbuff_new(fdata, pd), fdata, NULL);
+    epan_dissect_run(&args->edt, cf->cd_t, phdr,
+                     frame_tvbuff_new(&cf->provider, fdata, pd), fdata, NULL);
 
   if (args->print_formfeed) {
     if (!new_page(args->print_args->stream))
@@ -2501,7 +2510,8 @@ write_pdml_packet(capture_file *cf, frame_data *fdata,
   write_packet_callback_args_t *args = (write_packet_callback_args_t *)argsp;
 
   /* Create the protocol tree, but don't fill in the column information. */
-  epan_dissect_run(&args->edt, cf->cd_t, phdr, frame_tvbuff_new(fdata, pd), fdata, NULL);
+  epan_dissect_run(&args->edt, cf->cd_t, phdr,
+                   frame_tvbuff_new(&cf->provider, fdata, pd), fdata, NULL);
 
   /* Write out the information in that tree. */
   write_pdml_proto_tree(NULL, NULL, PF_NONE, &args->edt, args->fh, FALSE);
@@ -2577,7 +2587,9 @@ write_psml_packet(capture_file *cf, frame_data *fdata,
 
   /* Fill in the column information */
   col_custom_prime_edt(&args->edt, &cf->cinfo);
-  epan_dissect_run(&args->edt, cf->cd_t, phdr, frame_tvbuff_new(fdata, pd), fdata, &cf->cinfo);
+  epan_dissect_run(&args->edt, cf->cd_t, phdr,
+                   frame_tvbuff_new(&cf->provider, fdata, pd),
+                   fdata, &cf->cinfo);
   epan_dissect_fill_in_columns(&args->edt, FALSE, TRUE);
 
   /* Write out the column information. */
@@ -2660,7 +2672,9 @@ write_csv_packet(capture_file *cf, frame_data *fdata,
 
   /* Fill in the column information */
   col_custom_prime_edt(&args->edt, &cf->cinfo);
-  epan_dissect_run(&args->edt, cf->cd_t, phdr, frame_tvbuff_new(fdata, pd), fdata, &cf->cinfo);
+  epan_dissect_run(&args->edt, cf->cd_t, phdr,
+                   frame_tvbuff_new(&cf->provider, fdata, pd),
+                   fdata, &cf->cinfo);
   epan_dissect_fill_in_columns(&args->edt, FALSE, TRUE);
 
   /* Write out the column information. */
@@ -2733,7 +2747,8 @@ carrays_write_packet(capture_file *cf, frame_data *fdata,
 {
   write_packet_callback_args_t *args = (write_packet_callback_args_t *)argsp;
 
-  epan_dissect_run(&args->edt, cf->cd_t, phdr, frame_tvbuff_new(fdata, pd), fdata, NULL);
+  epan_dissect_run(&args->edt, cf->cd_t, phdr,
+                   frame_tvbuff_new(&cf->provider, fdata, pd), fdata, NULL);
   write_carrays_hex_data(fdata->num, args->fh, &args->edt);
   epan_dissect_reset(&args->edt);
 
@@ -2795,7 +2810,8 @@ write_json_packet(capture_file *cf, frame_data *fdata,
   write_packet_callback_args_t *args = (write_packet_callback_args_t *)argsp;
 
   /* Create the protocol tree, but don't fill in the column information. */
-  epan_dissect_run(&args->edt, cf->cd_t, phdr, frame_tvbuff_new(fdata, pd), fdata, NULL);
+  epan_dissect_run(&args->edt, cf->cd_t, phdr,
+                   frame_tvbuff_new(&cf->provider, fdata, pd), fdata, NULL);
 
   /* Write out the information in that tree. */
   write_json_proto_tree(NULL, args->print_args->print_dissections,
@@ -2902,7 +2918,9 @@ match_protocol_tree(capture_file *cf, frame_data *fdata, void *criterion)
   /* Construct the protocol tree, including the displayed text */
   epan_dissect_init(&edt, cf->epan, TRUE, TRUE);
   /* We don't need the column information */
-  epan_dissect_run(&edt, cf->cd_t, &cf->phdr, frame_tvbuff_new_buffer(fdata, &cf->buf), fdata, NULL);
+  epan_dissect_run(&edt, cf->cd_t, &cf->phdr,
+                   frame_tvbuff_new_buffer(&cf->provider, fdata, &cf->buf),
+                   fdata, NULL);
 
   /* Iterate through all the nodes, seeing if they have text that matches. */
   mdata->cf = cf;
@@ -3014,8 +3032,9 @@ match_summary_line(capture_file *cf, frame_data *fdata, void *criterion)
   /* Don't bother constructing the protocol tree */
   epan_dissect_init(&edt, cf->epan, FALSE, FALSE);
   /* Get the column information */
-  epan_dissect_run(&edt, cf->cd_t, &cf->phdr, frame_tvbuff_new_buffer(fdata, &cf->buf), fdata,
-                   &cf->cinfo);
+  epan_dissect_run(&edt, cf->cd_t, &cf->phdr,
+                   frame_tvbuff_new_buffer(&cf->provider, fdata, &cf->buf),
+                   fdata, &cf->cinfo);
 
   /* Find the Info column */
   for (colx = 0; colx < cf->cinfo.num_cols; colx++) {
@@ -3360,7 +3379,9 @@ match_dfilter(capture_file *cf, frame_data *fdata, void *criterion)
 
   epan_dissect_init(&edt, cf->epan, TRUE, FALSE);
   epan_dissect_prime_with_dfilter(&edt, sfcode);
-  epan_dissect_run(&edt, cf->cd_t, &cf->phdr, frame_tvbuff_new_buffer(fdata, &cf->buf), fdata, NULL);
+  epan_dissect_run(&edt, cf->cd_t, &cf->phdr,
+                   frame_tvbuff_new_buffer(&cf->provider, fdata, &cf->buf),
+                   fdata, NULL);
   result = dfilter_apply_edt(sfcode, &edt) ? MR_MATCHED : MR_NOTMATCHED;
   epan_dissect_cleanup(&edt);
   return result;
@@ -3646,7 +3667,8 @@ cf_select_packet(capture_file *cf, int row)
   cf->edt = epan_dissect_new(cf->epan, TRUE, TRUE);
 
   tap_build_interesting(cf->edt);
-  epan_dissect_run(cf->edt, cf->cd_t, &cf->phdr, frame_tvbuff_new_buffer(cf->current_frame, &cf->buf),
+  epan_dissect_run(cf->edt, cf->cd_t, &cf->phdr,
+                   frame_tvbuff_new_buffer(&cf->provider, cf->current_frame, &cf->buf),
                    cf->current_frame, NULL);
 
   dfilter_macro_build_ftv_cache(cf->edt->tree);

diff --git a/fileset.c b/fileset.c
index 88d69966822c083d9b57ca31dc6dc1aab72be919..6e8ea0157535032543b36e4d12bcef2e7f51a13f 100644 (file)
--- a/fileset.c
+++ b/fileset.c
@@ -21,7 +21,6 @@
 
 #include <wsutil/file_util.h>
 #include <wsutil/filesystem.h>
-#include "globals.h"
 
 #include <epan/strutil.h>
 

diff --git a/frame_tvbuff.c b/frame_tvbuff.c
index f2ad3e606b14b3dac811f263f33c37c9a086fc72..e5309bd134ed1c79b5b19062032f0baeda0b34f0 100644 (file)
--- a/frame_tvbuff.c
+++ b/frame_tvbuff.c
@@ -17,7 +17,6 @@
 #include <epan/tvbuff.h>
 
 #include "frame_tvbuff.h"
-#include "globals.h"
 
 #include "wiretap/wtap-int.h" /* for ->random_fh */
 
@@ -26,7 +25,7 @@ struct tvb_frame {
 
        Buffer *buf;         /* Packet data */
 
-       wtap *wth;           /**< Wiretap session */
+       const struct packet_provider_data *prov;        /* provider of packet information */
        gint64 file_off;     /**< File offset */
 
        guint offset;
@@ -38,14 +37,10 @@ frame_read(struct tvb_frame *frame_tvb, struct wtap_pkthdr *phdr, Buffer *buf)
        int    err;
        gchar *err_info;
 
-       /* sanity check, capture file was closed? */
-       if (cfile.provider.wth != frame_tvb->wth)
-               return FALSE;
-
        /* XXX, what if phdr->caplen isn't equal to
         * frame_tvb->tvb.length + frame_tvb->offset?
         */
-       if (!wtap_seek_read(frame_tvb->wth, frame_tvb->file_off, phdr, buf, &err, &err_info)) {
+       if (!wtap_seek_read(frame_tvb->prov->wth, frame_tvb->file_off, phdr, buf, &err, &err_info)) {
                /* XXX - report error! */
                switch (err) {
                        case WTAP_ERR_BAD_FILE:
@@ -165,7 +160,8 @@ static const struct tvb_ops tvb_frame_ops = {
 
 /* based on tvb_new_real_data() */
 tvbuff_t *
-frame_tvbuff_new(const frame_data *fd, const guint8 *buf)
+frame_tvbuff_new(const struct packet_provider_data *prov, const frame_data *fd,
+    const guint8 *buf)
 {
        struct tvb_frame *frame_tvb;
        tvbuff_t *tvb;
@@ -208,12 +204,12 @@ frame_tvbuff_new(const frame_data *fd, const guint8 *buf)
        frame_tvb = (struct tvb_frame *) tvb;
 
        /* XXX, wtap_can_seek() */
-       if (cfile.provider.wth && cfile.provider.wth->random_fh) {
-               frame_tvb->wth = cfile.provider.wth;
+       if (prov->wth && prov->wth->random_fh) {
+               frame_tvb->prov = prov;
                frame_tvb->file_off = fd->file_off;
                frame_tvb->offset = 0;
        } else
-               frame_tvb->wth = NULL;
+               frame_tvb->prov = NULL;
 
        frame_tvb->buf = NULL;
 
@@ -221,9 +217,10 @@ frame_tvbuff_new(const frame_data *fd, const guint8 *buf)
 }
 
 tvbuff_t *
-frame_tvbuff_new_buffer(const frame_data *fd, Buffer *buf)
+frame_tvbuff_new_buffer(const struct packet_provider_data *prov,
+    const frame_data *fd, Buffer *buf)
 {
-       return frame_tvbuff_new(fd, ws_buffer_start_ptr(buf));
+       return frame_tvbuff_new(prov, fd, ws_buffer_start_ptr(buf));
 }
 
 static tvbuff_t *
@@ -235,7 +232,7 @@ frame_clone(tvbuff_t *tvb, guint abs_offset, guint abs_length)
        struct tvb_frame *cloned_frame_tvb;
 
        /* file not seekable */
-       if (!frame_tvb->wth)
+       if (!frame_tvb->prov)
                return NULL;
 
        abs_offset += frame_tvb->offset;
@@ -255,7 +252,7 @@ frame_clone(tvbuff_t *tvb, guint abs_offset, guint abs_length)
        cloned_tvb->ds_tvb = cloned_tvb;
 
        cloned_frame_tvb = (struct tvb_frame *) cloned_tvb;
-       cloned_frame_tvb->wth = frame_tvb->wth;
+       cloned_frame_tvb->prov = frame_tvb->prov;
        cloned_frame_tvb->file_off = frame_tvb->file_off;
        cloned_frame_tvb->offset = abs_offset;
        cloned_frame_tvb->buf = NULL;
@@ -266,7 +263,8 @@ frame_clone(tvbuff_t *tvb, guint abs_offset, guint abs_length)
 
 /* based on tvb_new_real_data() */
 tvbuff_t *
-file_tvbuff_new(const frame_data *fd, const guint8 *buf)
+file_tvbuff_new(const struct packet_provider_data *prov, const frame_data *fd,
+    const guint8 *buf)
 {
        struct tvb_frame *frame_tvb;
        tvbuff_t *tvb;
@@ -309,12 +307,12 @@ file_tvbuff_new(const frame_data *fd, const guint8 *buf)
        frame_tvb = (struct tvb_frame *) tvb;
 
        /* XXX, wtap_can_seek() */
-       if (cfile.provider.wth && cfile.provider.wth->random_fh) {
-               frame_tvb->wth = cfile.provider.wth;
+       if (prov->wth && prov->wth->random_fh) {
+               frame_tvb->prov = prov;
                frame_tvb->file_off = fd->file_off;
                frame_tvb->offset = 0;
        } else
-               frame_tvb->wth = NULL;
+               frame_tvb->prov = NULL;
 
        frame_tvb->buf = NULL;
 
@@ -322,9 +320,10 @@ file_tvbuff_new(const frame_data *fd, const guint8 *buf)
 }
 
 tvbuff_t *
-file_tvbuff_new_buffer(const frame_data *fd, Buffer *buf)
+file_tvbuff_new_buffer(const struct packet_provider_data *prov,
+    const frame_data *fd, Buffer *buf)
 {
-       return frame_tvbuff_new(fd, ws_buffer_start_ptr(buf));
+       return frame_tvbuff_new(prov, fd, ws_buffer_start_ptr(buf));
 }
 
 /*

diff --git a/frame_tvbuff.h b/frame_tvbuff.h
index d9428e709d340721d68ad26813713a27a237ca04..5b8edb4dd4e546821946f44ba09ee922fbbff0ed 100644 (file)
--- a/frame_tvbuff.h
+++ b/frame_tvbuff.h
@@ -11,19 +11,25 @@
 #ifndef __FRAME_TVBUFF_H__
 #define __FRAME_TVBUFF_H__
 
+#include "cfile.h"
+
+#include <wiretap/wtap.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#include <wiretap/wtap.h>
-
-extern tvbuff_t *frame_tvbuff_new(const frame_data *fd, const guint8 *buf);
+extern tvbuff_t *frame_tvbuff_new(const struct packet_provider_data *prov,
+    const frame_data *fd, const guint8 *buf);
 
-extern tvbuff_t *frame_tvbuff_new_buffer(const frame_data *fd, Buffer *buf);
+extern tvbuff_t *frame_tvbuff_new_buffer(const struct packet_provider_data *prov,
+    const frame_data *fd, Buffer *buf);
 
-extern tvbuff_t *file_tvbuff_new(const frame_data *fd, const guint8 *buf);
+extern tvbuff_t *file_tvbuff_new(const struct packet_provider_data *prov,
+    const frame_data *fd, const guint8 *buf);
 
-extern tvbuff_t *file_tvbuff_new_buffer(const frame_data *fd, Buffer *buf);
+extern tvbuff_t *file_tvbuff_new_buffer(const struct packet_provider_data *prov,
+    const frame_data *fd, Buffer *buf);
 
 #ifdef __cplusplus
 }

diff --git a/rawshark.c b/rawshark.c
index eb382fd5ba35e819090a79621161ef8701928cb6..68dedaddd4a77d1d9adb7d445407603feb605916 100644 (file)
--- a/rawshark.c
+++ b/rawshark.c
@@ -1037,7 +1037,9 @@ process_packet(capture_file *cf, epan_dissect_t *edt, gint64 offset,
     /* We only need the columns if we're printing packet info but we're
      *not* verbose; in verbose mode, we print the protocol tree, not
      the protocol summary. */
-    epan_dissect_run_with_taps(edt, cf->cd_t, whdr, frame_tvbuff_new(&fdata, pd), &fdata, &cf->cinfo);
+    epan_dissect_run_with_taps(edt, cf->cd_t, whdr,
+                               frame_tvbuff_new(&cf->provider, &fdata, pd),
+                               &fdata, &cf->cinfo);
 
     frame_data_set_after_dissect(&fdata, &cum_bytes);
     prev_dis_frame = fdata;

diff --git a/sharkd.c b/sharkd.c
index d2be886e307073683ccf8b52fa1a8b3a211c9c99..903d9bd5407a2a6a7e591f4b5039123aca4a80f1 100644 (file)
--- a/sharkd.c
+++ b/sharkd.c
@@ -301,7 +301,9 @@ process_packet(capture_file *cf, epan_dissect_t *edt,
       cf->provider.ref = &ref_frame;
     }
 
-    epan_dissect_run(edt, cf->cd_t, whdr, frame_tvbuff_new(&fdlocal, pd), &fdlocal, NULL);
+    epan_dissect_run(edt, cf->cd_t, whdr,
+                     frame_tvbuff_new(&cf->provider, &fdlocal, pd),
+                     &fdlocal, NULL);
 
     /* Run the read filter if we have one. */
     if (cf->rfcode)
@@ -569,7 +571,9 @@ sharkd_dissect_request(unsigned int framenum, void (*cb)(epan_dissect_t *, proto
    * XXX - need to catch an OutOfMemoryError exception and
    * attempt to recover from it.
    */
-  epan_dissect_run(&edt, cfile.cd_t, &phdr, frame_tvbuff_new_buffer(fdata, &buf), fdata, cinfo);
+  epan_dissect_run(&edt, cfile.cd_t, &phdr,
+                   frame_tvbuff_new_buffer(&cfile.provider, fdata, &buf),
+                   fdata, cinfo);
 
   if (cinfo) {
     /* "Stringify" non frame_data vals */
@@ -621,7 +625,9 @@ sharkd_dissect_columns(frame_data *fdata, column_info *cinfo, gboolean dissect_c
    * XXX - need to catch an OutOfMemoryError exception and
    * attempt to recover from it.
    */
-  epan_dissect_run(&edt, cfile.cd_t, &phdr, frame_tvbuff_new_buffer(fdata, &buf), fdata, cinfo);
+  epan_dissect_run(&edt, cfile.cd_t, &phdr,
+                   frame_tvbuff_new_buffer(&cfile.provider, fdata, &buf),
+                   fdata, cinfo);
 
   if (cinfo) {
     /* "Stringify" non frame_data vals */
@@ -678,7 +684,9 @@ sharkd_retap(void)
     if (!wtap_seek_read(cfile.provider.wth, fdata->file_off, &phdr, &buf, &err, &err_info))
       break;
 
-    epan_dissect_run_with_taps(&edt, cfile.cd_t, &phdr, frame_tvbuff_new(fdata, ws_buffer_start_ptr(&buf)), fdata, cinfo);
+    epan_dissect_run_with_taps(&edt, cfile.cd_t, &phdr,
+                               frame_tvbuff_new(&cfile.provider, fdata, ws_buffer_start_ptr(&buf)),
+                               fdata, cinfo);
     epan_dissect_reset(&edt);
   }
 
@@ -736,7 +744,9 @@ sharkd_filter(const char *dftext, guint8 **result)
     /* frame_data_set_before_dissect */
     epan_dissect_prime_with_dfilter(&edt, dfcode);
 
-    epan_dissect_run(&edt, cfile.cd_t, &phdr, frame_tvbuff_new_buffer(fdata, &buf), fdata, NULL);
+    epan_dissect_run(&edt, cfile.cd_t, &phdr,
+                     frame_tvbuff_new_buffer(&cfile.provider, fdata, &buf),
+                     fdata, NULL);
 
     if (dfilter_apply_edt(dfcode, &edt))
       passed_bits |= (1 << (framenum % 8));

diff --git a/sharkd.h b/sharkd.h
index b08754c97a2061ea238ef1551df300503d217d37..d351cea71b447fd87e9b4952e0434f516628fbab 100644 (file)
--- a/sharkd.h
+++ b/sharkd.h
@@ -13,7 +13,6 @@
 #define __SHARKD_H
 
 #include <file.h>
-#include <globals.h>
 
 /* sharkd.c */
 cf_status_t sharkd_cf_open(const char *fname, unsigned int type, gboolean is_tempfile, int *err);

diff --git a/sharkd_session.c b/sharkd_session.c
index 1a165a9fa2ef21d7c4dc22c0d4f7e2f1a5e8d43a..e9c9f702b201bdff002f3c2c3215149ab10dd872 100644 (file)
--- a/sharkd_session.c
+++ b/sharkd_session.c
@@ -69,6 +69,8 @@
 #include <wsutil/glib-compat.h>
 #include <wsutil/strtoi.h>
 
+#include "globals.h"
+
 #include "sharkd.h"
 
 static gboolean

diff --git a/tfshark.c b/tfshark.c
index d8cdfcbc042bb9f776485e6bde36dc82966452fc..3b69005802239ef10d02215b05effafa540c3342 100644 (file)
--- a/tfshark.c
+++ b/tfshark.c
@@ -1101,7 +1101,9 @@ process_packet_first_pass(capture_file *cf, epan_dissect_t *edt,
       cf->provider.ref = &ref_frame;
     }
 
-    epan_dissect_file_run(edt, whdr, file_tvbuff_new(&fdlocal, pd), &fdlocal, NULL);
+    epan_dissect_file_run(edt, whdr,
+                          file_tvbuff_new(&cf->provider, &fdlocal, pd),
+                          &fdlocal, NULL);
 
     /* Run the read filter if we have one. */
     if (cf->rfcode)
@@ -1180,7 +1182,8 @@ process_packet_second_pass(capture_file *cf, epan_dissect_t *edt,
       cf->provider.ref = &ref_frame;
     }
 
-    epan_dissect_file_run_with_taps(edt, phdr, file_tvbuff_new_buffer(fdata, buf), fdata, cinfo);
+    epan_dissect_file_run_with_taps(edt, phdr,
+        file_tvbuff_new_buffer(&cf->provider, fdata, buf), fdata, cinfo);
 
     /* Run the read/display filter if we have one. */
     if (cf->dfcode)
@@ -1623,7 +1626,9 @@ process_packet_single_pass(capture_file *cf, epan_dissect_t *edt, gint64 offset,
       cf->provider.ref = &ref_frame;
     }
 
-    epan_dissect_file_run_with_taps(edt, whdr, frame_tvbuff_new(&fdata, pd), &fdata, cinfo);
+    epan_dissect_file_run_with_taps(edt, whdr,
+                                    frame_tvbuff_new(&cf->provider, &fdata, pd),
+                                    &fdata, cinfo);
 
     /* Run the filter if we have it. */
     if (cf->dfcode)

diff --git a/tshark.c b/tshark.c
index 099f49ff974cde7e3a42c062c615ee6d0c81e3e3..a8fefc26826b8c7920c23849a1d29c2b1bad1c90 100644 (file)
--- a/tshark.c
+++ b/tshark.c
@@ -2912,7 +2912,9 @@ process_packet_first_pass(capture_file *cf, epan_dissect_t *edt,
       cf->provider.ref = &ref_frame;
     }
 
-    epan_dissect_run(edt, cf->cd_t, whdr, frame_tvbuff_new(&fdlocal, pd), &fdlocal, NULL);
+    epan_dissect_run(edt, cf->cd_t, whdr,
+                     frame_tvbuff_new(&cf->provider, &fdlocal, pd),
+                     &fdlocal, NULL);
 
     /* Run the read filter if we have one. */
     if (cf->rfcode)
@@ -3002,7 +3004,9 @@ process_packet_second_pass(capture_file *cf, epan_dissect_t *edt,
       fdata->flags.need_colorize = 1;
     }
 
-    epan_dissect_run_with_taps(edt, cf->cd_t, phdr, frame_tvbuff_new_buffer(fdata, buf), fdata, cinfo);
+    epan_dissect_run_with_taps(edt, cf->cd_t, phdr,
+                               frame_tvbuff_new_buffer(&cf->provider, fdata, buf),
+                               fdata, cinfo);
 
     /* Run the read/display filter if we have one. */
     if (cf->dfcode)
@@ -3517,7 +3521,9 @@ process_packet_single_pass(capture_file *cf, epan_dissect_t *edt, gint64 offset,
       fdata.flags.need_colorize = 1;
     }
 
-    epan_dissect_run_with_taps(edt, cf->cd_t, whdr, frame_tvbuff_new(&fdata, pd), &fdata, cinfo);
+    epan_dissect_run_with_taps(edt, cf->cd_t, whdr,
+                               frame_tvbuff_new(&cf->provider, &fdata, pd),
+                               &fdata, cinfo);
 
     /* Run the filter if we have it. */
     if (cf->dfcode)

diff --git a/ui/gtk/addr_resolution_dlg.c b/ui/gtk/addr_resolution_dlg.c
index a8fe7a2c8755f1aea0898ec3f99bf814ddb8d914..77580470cbc5de749c4590965b5207e35235809a 100644 (file)
--- a/ui/gtk/addr_resolution_dlg.c
+++ b/ui/gtk/addr_resolution_dlg.c
@@ -37,6 +37,8 @@
 #include "ui/gtk/main.h"
 #include "ui/gtk/addr_resolution_dlg.h"
 
+#include "globals.h"
+
 static GtkWidget *addr_resolution_dlg_w = NULL;
 
 

diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index 5f1516695edb79541ebfef6e1387df61ca999124..7e0e2a449631568561953cbb2822b5a6276b2cb6 100644 (file)
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -89,6 +89,8 @@
 #include "ui/gtk/extcap_gtk.h"
 #endif
 
+#include "globals.h"
+
 /*
  * Symbolic names for column indices.
  */

diff --git a/ui/gtk/capture_file_dlg.h b/ui/gtk/capture_file_dlg.h
index 02d544abc4bebe692f24da16706befd0ea9d4445..deda5f8943bd8c5607832e6c964429b95c4b6689 100644 (file)
--- a/ui/gtk/capture_file_dlg.h
+++ b/ui/gtk/capture_file_dlg.h
@@ -23,6 +23,8 @@
 #ifndef __CAPTURE_FILE_DLG_H__
 #define __CAPTURE_FILE_DLG_H__
 
+#include "cfile.h"
+
 /** @file
  *  "Open" / "Close" / "Save" / "Save As" / etc dialog boxes.
  *  @ingroup dialog_group

diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c
index f6acef1a8fe2829173be837c9eb501028774d2e2..790a132130c375dc7239c07f8e20300b64206828 100644 (file)
--- a/ui/gtk/conversations_table.c
+++ b/ui/gtk/conversations_table.c
@@ -29,7 +29,6 @@
 
 #include <epan/addr_resolv.h>
 
-
 #include <epan/stat_groups.h>
 
 #include "ui/simple_dialog.h"
@@ -49,6 +48,8 @@
 
 #include "ui/gtk/old-gtk-compat.h"
 
+#include "globals.h"
+
 #define COL_STR_LEN 16
 #define CONV_PTR_KEY "conversations-pointer"
 #define NB_PAGES_KEY "notebook-pages"

diff --git a/ui/gtk/dcerpc_stat.c b/ui/gtk/dcerpc_stat.c
index d4d3a9956ad9eebf611814e3b9f362a7725d7ea9..bf5006d39dc664de3d0d0283528b84d9a4fa1a27 100644 (file)
--- a/ui/gtk/dcerpc_stat.c
+++ b/ui/gtk/dcerpc_stat.c
@@ -39,7 +39,6 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-dcerpc.h>
 
-
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/gui_stat_menu.h"
@@ -54,6 +53,8 @@
 
 #include "ui/gtk/old-gtk-compat.h"
 
+#include "globals.h"
+
 void register_tap_listener_gtkdcerpcstat(void);
 
 /* used to keep track of the statistics for an entire program interface */

diff --git a/ui/gtk/decode_as_dlg.c b/ui/gtk/decode_as_dlg.c
index b7c6808baa4063b461bde244bb6f41730ff72e1c..5f615e87214a5882153309573a0b2ae9d7632beb 100644 (file)
--- a/ui/gtk/decode_as_dlg.c
+++ b/ui/gtk/decode_as_dlg.c
@@ -47,6 +47,8 @@
 #include "ui/gtk/packet_win.h"
 #include "ui/gtk/stock_icons.h"
 
+#include "globals.h"
+
 #undef DEBUG
 
 /**************************************************/

diff --git a/ui/gtk/drag_and_drop.c b/ui/gtk/drag_and_drop.c
index 8c4f30fbb4f9d410bd32233fe379215845d158ac..963e503023b0c809305277aa632674542f444b1a 100644 (file)
--- a/ui/gtk/drag_and_drop.c
+++ b/ui/gtk/drag_and_drop.c
@@ -45,6 +45,7 @@
 
 #include "ui/gtk/old-gtk-compat.h"
 
+#include "globals.h"
 
 enum { DND_TARGET_STRING, DND_TARGET_ROOTWIN, DND_TARGET_URL };
 

diff --git a/ui/gtk/edit_packet_comment_dlg.c b/ui/gtk/edit_packet_comment_dlg.c
index 95caa6cc83056dcbe501d865871072980f766f23..a1e6cba7ed51edd6f0d6d5abc9fc0e16fe993886 100644 (file)
--- a/ui/gtk/edit_packet_comment_dlg.c
+++ b/ui/gtk/edit_packet_comment_dlg.c
@@ -27,7 +27,6 @@
 
 #include <gtk/gtk.h>
 
-
 #include "ui/main_statusbar.h"
 
 #include "ui/gtk/dlg_utils.h"
@@ -37,6 +36,8 @@
 #include "ui/gtk/packet_list.h"
 #include "ui/gtk/edit_packet_comment_dlg.h"
 
+#include "globals.h"
+
 static GtkWidget *edit_or_add_pkt_comment_dlg = NULL;
 static GtkWidget *edit_or_add_capture_comment_dlg = NULL;
 

diff --git a/ui/gtk/expert_comp_dlg.c b/ui/gtk/expert_comp_dlg.c
index 6bfed3112db6aa6179bc9f00c2e7150f87585771..8f6e1270a9ca2418e98d5a832f8fab6f221727e6 100644 (file)
--- a/ui/gtk/expert_comp_dlg.c
+++ b/ui/gtk/expert_comp_dlg.c
@@ -49,6 +49,8 @@
 #include "ui/gtk/edit_packet_comment_dlg.h"
 #include "ui/gtk/gtkglobals.h"
 
+#include "globals.h"
+
 void register_tap_listener_expert_comp(void);
 
 enum

diff --git a/ui/gtk/expert_comp_table.c b/ui/gtk/expert_comp_table.c
index 53bd0c3dac3337134bfede2cf743042c11192a11..beb07bc7198c6080476dbfcface460099f1e81ac 100644 (file)
--- a/ui/gtk/expert_comp_table.c
+++ b/ui/gtk/expert_comp_table.c
@@ -51,6 +51,8 @@
 
 #include "ui/gtk/old-gtk-compat.h"
 
+#include "globals.h"
+
 const char  *packet = "Packet:";
 
 enum

diff --git a/ui/gtk/export_object_dlg.c b/ui/gtk/export_object_dlg.c
index ee0783827e4dd25df608a342cbc4f101c5379b84..d56acd9f2b9ca6474d1314b9333a69b5cfbc25d9 100644 (file)
--- a/ui/gtk/export_object_dlg.c
+++ b/ui/gtk/export_object_dlg.c
@@ -35,6 +35,8 @@
 #include <ui/export_object_ui.h>
 #include <ui/simple_dialog.h>
 
+#include "globals.h"
+
 #include "dlg_utils.h"
 #include "file_dlg.h"
 #include "gui_utils.h"

diff --git a/ui/gtk/export_pdu_dlg.c b/ui/gtk/export_pdu_dlg.c
index 929cce92d42801e9434bc07939f4518665cec57d..a9a239683d0ec1741dcd34a305ea638870d35799 100644 (file)
--- a/ui/gtk/export_pdu_dlg.c
+++ b/ui/gtk/export_pdu_dlg.c
@@ -24,7 +24,6 @@
 
 #include <gtk/gtk.h>
 
-#include "globals.h"
 #include <wiretap/pcap-encap.h>
 
 #include <epan/exported_pdu.h>

diff --git a/ui/gtk/export_sslkeys.c b/ui/gtk/export_sslkeys.c
index 4ac2c51b43a44fb1aa5282f575b1cee270992466..be52722645dd2ec0e629c199eaad2314b84cbc36 100644 (file)
--- a/ui/gtk/export_sslkeys.c
+++ b/ui/gtk/export_sslkeys.c
@@ -25,6 +25,7 @@
 #include "config.h"
 
 #include <string.h>
+#include <errno.h>
 
 #include <wsutil/file_util.h>
 #include <wsutil/str_util.h>

diff --git a/ui/gtk/fileset_dlg.c b/ui/gtk/fileset_dlg.c
index aa2945edfca822b4ce46e66117bc71a223a5008c..e6845833099d0a6b2d4c10da6ef509009ad22d46 100644 (file)
--- a/ui/gtk/fileset_dlg.c
+++ b/ui/gtk/fileset_dlg.c
@@ -27,7 +27,7 @@
 #include "ui/gtk/fileset_dlg.h"
 #include "ui/gtk/old-gtk-compat.h"
 
-
+#include "globals.h"
 
 /*
  * Keep a static pointer to the current "File Set" window, if

diff --git a/ui/gtk/filter_expression_save_dlg.c b/ui/gtk/filter_expression_save_dlg.c
index f02037df90bd090ba7937738b02e88858d7e4c57..f9da20e3d04e2b914cad0beccb3a576e1e748645 100644 (file)
--- a/ui/gtk/filter_expression_save_dlg.c
+++ b/ui/gtk/filter_expression_save_dlg.c
@@ -41,6 +41,7 @@
 #include "ui/gtk/filter_autocomplete.h"
 #include "ui/gtk/help_dlg.h"
 
+#include "globals.h"
 #include "main.h"
 
 

diff --git a/ui/gtk/filter_expression_save_dlg.h b/ui/gtk/filter_expression_save_dlg.h
index 5730b693aa9db3fa72fb02fd963c77667ea98fe7..319e49f76f1cd42681a25d5b1ea2ab632da10ce6 100644 (file)
--- a/ui/gtk/filter_expression_save_dlg.h
+++ b/ui/gtk/filter_expression_save_dlg.h
@@ -23,7 +23,6 @@
 #ifndef __FILTER_EXPRESSIONS_SAVE_DLG_H__
 #define __FILTER_EXPRESSIONS_SAVE_DLG_H__
 
-#include "globals.h"
 #include "epan/filter_expressions.h"
 
 enum {

diff --git a/ui/gtk/filter_utils.c b/ui/gtk/filter_utils.c
index d5dc2da64fcfd01dac28798bf355f5e01ea9f54c..1eca642d8c99b6262f5e61541ba151e013891ded 100644 (file)
--- a/ui/gtk/filter_utils.c
+++ b/ui/gtk/filter_utils.c
@@ -32,6 +32,8 @@
 
 #include "ui/gtk/old-gtk-compat.h"
 
+#include "globals.h"
+
 void
 apply_selected_filter (guint callback_action, const char *filter)
 {

diff --git a/ui/gtk/firewall_dlg.c b/ui/gtk/firewall_dlg.c
index 1de148d7f619cc43dd7080530a4386e8c09d4fda..f671465c17eabee7b85ea3954c76dca296498bdd 100644 (file)
--- a/ui/gtk/firewall_dlg.c
+++ b/ui/gtk/firewall_dlg.c
@@ -50,6 +50,8 @@
 #include "ui/gtk/old-gtk-compat.h"
 #include "ui/gtk/firewall_dlg.h"
 
+#include "globals.h"
+
 #define MAX_RULE_LEN 200
 
 /* Copied from packet_info struct */

diff --git a/ui/gtk/flow_graph.c b/ui/gtk/flow_graph.c
index 018138efaf66ee13c57c159d4502a277b7254344..0b79053a0370a3d2b374f341844c41feea99a6d6 100644 (file)
--- a/ui/gtk/flow_graph.c
+++ b/ui/gtk/flow_graph.c
@@ -26,7 +26,6 @@
 #include "config.h"
 #include <string.h>
 
-
 #include <epan/packet.h>
 #include <epan/stat_tap_ui.h>
 
@@ -39,6 +38,8 @@
 #include "ui/gtk/old-gtk-compat.h"
 #include "ui/gtk/gtkglobals.h"
 
+#include "globals.h"
+
 void register_tap_listener_flow_graph(void);
 
 static seq_analysis_info_t *graph_analysis       = NULL;

diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c
index fe8578347c0bd6535f6f0409feb10176bb7534e3..e172d67556428b907b4f5948e024080ac877ceee 100644 (file)
--- a/ui/gtk/follow_stream.c
+++ b/ui/gtk/follow_stream.c
@@ -63,6 +63,8 @@
 #include "ui/win32/print_win32.h"
 #endif
 
+#include "globals.h"
+
 /* static variable declarations to speed up the performance
  * of follow_load_text and follow_add_to_gtk_text
  */

diff --git a/ui/gtk/funnel_stat.c b/ui/gtk/funnel_stat.c
index d9c3f2fd21e83bb8498f4fba277c6c0c00daec66..a17ebef0d6fdd1f53d0f4d2b77e22f94242b6385 100644 (file)
--- a/ui/gtk/funnel_stat.c
+++ b/ui/gtk/funnel_stat.c
@@ -56,6 +56,8 @@
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/old-gtk-compat.h"
 
+#include "globals.h"
+
 void register_tap_listener_gtkfunnel(void);
 
 struct _funnel_text_window_t {

diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c
index 407eb3c1abcdbb4a45432d23efa4bcf0b1fd0801..e85a044a872dbdeda3ea50cf17108b1dea607586 100644 (file)
--- a/ui/gtk/graph_analysis.c
+++ b/ui/gtk/graph_analysis.c
@@ -64,6 +64,8 @@
 #include "ui/gtk/old-gtk-compat.h"
 #include "ui/gtk/stock_icons.h"
 
+#include "globals.h"
+
 /****************************************************************************/
 
 #define MAX_LABEL 50

diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c
index 25aa75e99ef45f8b1b2756eaa63de1d2634d72cf..7e593cdc219d4080a4e1a3d5a2e1f371e9989177 100644 (file)
--- a/ui/gtk/hostlist_table.c
+++ b/ui/gtk/hostlist_table.c
@@ -56,6 +56,8 @@
 
 #include "ui/gtk/old-gtk-compat.h"
 
+#include "globals.h"
+
 #define HOST_PTR_KEY "hostlist-pointer"
 #define NB_PAGES_KEY "notebook-pages"
 #define HL_DLG_HEIGHT 550

diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c
index a4d3b5b8a44b7d0e37cc8caa1cd891ede8c21f57..b52d996586659d6fbcf84bb1f6e54e388cb6a7d6 100644 (file)
--- a/ui/gtk/iax2_analysis.c
+++ b/ui/gtk/iax2_analysis.c
@@ -79,6 +79,8 @@
 
 #include "frame_tvbuff.h"
 
+#include "globals.h"
+
 void register_tap_listener_iax2_analysis(void);
 
 enum
@@ -3568,7 +3570,8 @@ void iax2_analysis_cb(GtkAction *action _U_, gpointer user_data _U_)
        epan_dissect_init(&edt, cf->epan, TRUE, FALSE);
        epan_dissect_prime_with_dfilter(&edt, sfcode);
        epan_dissect_run(&edt, cf->cd_t, &cf->phdr,
-           frame_tvbuff_new_buffer(fdata, &cf->buf), fdata, NULL);
+           frame_tvbuff_new_buffer(&cf->provider, fdata, &cf->buf),
+           fdata, NULL);
 
        /* if it is not an iax2 packet, show an error dialog */
        if (!dfilter_apply_edt(sfcode, &edt)) {

diff --git a/ui/gtk/io_stat.c b/ui/gtk/io_stat.c
index a5afd6fcbee0b0777d7f6135a075e9a61a9f5712..b4c54ce60030a47c47544877bea3b58155a8a700 100644 (file)
--- a/ui/gtk/io_stat.c
+++ b/ui/gtk/io_stat.c
@@ -46,6 +46,7 @@
 #include "ui/gtk/filter_autocomplete.h"
 #include "ui/main_statusbar.h"
 
+#include "globals.h"
 
 void register_tap_listener_gtk_iostat(void);
 

diff --git a/ui/gtk/mac_lte_stat_dlg.c b/ui/gtk/mac_lte_stat_dlg.c
index 6986a53c0040bb7d944d96038121311710f3e673..ed3e957fec63f3adbbab5ea41e3fb1d334f8ef85 100644 (file)
--- a/ui/gtk/mac_lte_stat_dlg.c
+++ b/ui/gtk/mac_lte_stat_dlg.c
@@ -44,6 +44,8 @@
 
 #include "ui/gtk/old-gtk-compat.h"
 
+#include "globals.h"
+
 void register_tap_listener_mac_lte_stat(void);
 
 /**********************************************/

diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 79b8c0588247f8c4b409491b144d9d75a76506aa..6c0e1c14661fd9e9a95b85496e9766497bcc080d 100644 (file)
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -533,7 +533,8 @@ get_ip_address_list_from_packet_list_row(gpointer data)
         col_custom_prime_edt(&edt, &cfile.cinfo);
 
         epan_dissect_run(&edt, cfile.cd_t, &cfile.phdr,
-            frame_tvbuff_new_buffer(fdata, &cfile.buf), fdata, &cfile.cinfo);
+            frame_tvbuff_new_buffer(&cfile.provider, fdata, &cfile.buf),
+            fdata, &cfile.cinfo);
         epan_dissect_fill_in_columns(&edt, TRUE, TRUE);
 
         /* First check selected column */
@@ -574,7 +575,7 @@ get_filter_from_packet_list_row_and_column(gpointer data)
         col_custom_prime_edt(&edt, &cfile.cinfo);
 
         epan_dissect_run(&edt, cfile.cd_t, &cfile.phdr,
-                         frame_tvbuff_new_buffer(fdata, &cfile.buf),
+                         frame_tvbuff_new_buffer(&cfile.provider, fdata, &cfile.buf),
                          fdata, &cfile.cinfo);
         epan_dissect_fill_in_columns(&edt, TRUE, TRUE);
 

diff --git a/ui/gtk/main.h b/ui/gtk/main.h
index 4c3064f5cd6d127e001ee06c62520bcb60f7d4b5..6444dfad6bcf342b32c40733006d70c4556c5d85 100644 (file)
--- a/ui/gtk/main.h
+++ b/ui/gtk/main.h
@@ -23,7 +23,7 @@
 #ifndef __MAIN_H__
 #define __MAIN_H__
 
-#include "globals.h"
+#include "cfile.h"
 #include "capture_opts.h"
 
 /** @defgroup main_window_group Main window

diff --git a/ui/gtk/main_filter_toolbar.c b/ui/gtk/main_filter_toolbar.c
index b555cd55c406e390d64f46dd44f55b3239ed1e3a..24b8c862d461b3357e2cd9790bf657dcac07f1a8 100644 (file)
--- a/ui/gtk/main_filter_toolbar.c
+++ b/ui/gtk/main_filter_toolbar.c
@@ -51,6 +51,8 @@
 #include "main_filter_toolbar.h"
 #include "filter_expression_save_dlg.h"
 
+#include "globals.h"
+
 #define MENU_BAR_PATH_FILE_OPEN                         "/Menubar/FileMenu/Open"
 #define MENU_BAR_PATH_EDIT_COPY_AS_FLT                  "/Menubar/EditMenu/Copy/AsFilter"
 #define MENU_BAR_PATH_ANALYZE_DISPLAY_FLT               "/Menubar/AnalyzeMenu/DisplayFilters"

diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c
index 4974a25e8314880047db6ad2f36257524df16124..45f1ef012998e1237aa5162dec2869c4f340f1ca 100644 (file)
--- a/ui/gtk/main_statusbar.c
+++ b/ui/gtk/main_statusbar.c
@@ -65,6 +65,8 @@
 #include "ui/gtk/menus.h"
 #include "ui/gtk/edit_packet_comment_dlg.h"
 
+#include "globals.h"
+
 /*
  * The order below defines the priority of info bar contexts.
  */

diff --git a/ui/gtk/main_toolbar.c b/ui/gtk/main_toolbar.c
index 3d107a82dd2433f54fed0829ae185875f2106269..bec7e1ec840d7b4ca4e97ad4655fa037704a334c 100644 (file)
--- a/ui/gtk/main_toolbar.c
+++ b/ui/gtk/main_toolbar.c
@@ -59,6 +59,8 @@
 
 #include "ui/gtk/old-gtk-compat.h"
 
+#include "globals.h"
+
 static gboolean toolbar_init = FALSE;
 
 #ifdef HAVE_LIBPCAP

diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c
index 27b0f214347d7b8c1919bf792a072f8baa46037f..8ab92a6f4afa0763b526234449b2f8b6bf0c3481 100644 (file)
--- a/ui/gtk/main_welcome.c
+++ b/ui/gtk/main_welcome.c
@@ -21,6 +21,7 @@
 
 #include "config.h"
 
+#include <errno.h>
 
 #include <gtk/gtk.h>
 
@@ -79,6 +80,8 @@
 #include "airpcap_gui_utils.h"
 #endif
 
+#include "file.h"
+
 /* XXX */
 static GtkWidget *welcome_hb = NULL;
 static GtkWidget *header_lb = NULL;

diff --git a/ui/gtk/manual_addr_resolv.c b/ui/gtk/manual_addr_resolv.c
index 085dc0637c1623f541c249796d55f7581f8f172c..fbb28d37821f30e144f0e8221d9407ce0ef6ee38 100644 (file)
--- a/ui/gtk/manual_addr_resolv.c
+++ b/ui/gtk/manual_addr_resolv.c
@@ -39,6 +39,8 @@
 #include "ui/gtk/packet_win.h"
 #include "simple_dialog.h"
 
+#include "globals.h"
+
 GtkWidget *man_addr_resolv_dlg = NULL;
 
 static void

diff --git a/ui/gtk/packet_history.c b/ui/gtk/packet_history.c
index 3b7dfefc0d6d276d670f0c3e2890a89970ee78bf..9e5b7a05b7aed43b40efd32ef649d558500ea0b4 100644 (file)
--- a/ui/gtk/packet_history.c
+++ b/ui/gtk/packet_history.c
@@ -22,13 +22,12 @@
 
 #include "config.h"
 
-
 #include <gtk/gtk.h>
 
-
 #include "ui/gtk/main.h"
 #include "ui/gtk/packet_history.h"
 
+#include "globals.h"
 
 static GList *history_current = NULL;
 static GList *history_list = NULL;

diff --git a/ui/gtk/packet_list.c b/ui/gtk/packet_list.c
index 5504c7db073c2a0fcbb41b09e3a754794708f841..566e2e4abfdb18305299b4dcb6e5d2b0880f16fc 100644 (file)
--- a/ui/gtk/packet_list.c
+++ b/ui/gtk/packet_list.c
@@ -61,6 +61,8 @@
 
 #include <wsutil/str_util.h>
 
+#include "globals.h"
+
 #define COLUMN_WIDTH_MIN 40
 #define MAX_COMMENTS_TO_FETCH 20000000 /* Arbitrary */
 

diff --git a/ui/gtk/packet_list_store.c b/ui/gtk/packet_list_store.c
index 5af1dd4df15f105c3ad8c9578a393656381d1856..57f2ba1bdc9133766294243836f0a1ca0250a563 100644 (file)
--- a/ui/gtk/packet_list_store.c
+++ b/ui/gtk/packet_list_store.c
@@ -1176,7 +1176,9 @@ packet_list_dissect_and_cache_record(PacketList *packet_list, PacketListRecord *
         * XXX - need to catch an OutOfMemoryError exception and
         * attempt to recover from it.
         */
-       epan_dissect_run(&edt, cfile.cd_t, &phdr, frame_tvbuff_new_buffer(fdata, &buf), fdata, cinfo);
+       epan_dissect_run(&edt, cfile.cd_t, &phdr,
+           frame_tvbuff_new_buffer(&cfile.provider, fdata, &buf),
+           fdata, cinfo);
 
        if (dissect_columns) {
                /* "Stringify" non frame_data vals */

diff --git a/ui/gtk/packet_panes.c b/ui/gtk/packet_panes.c
index ac6e7b582e691929990bb03d77ebdad04cafac13..37b875a8876c51dc0bc224a433a0ee4a4ae311d5 100644 (file)
--- a/ui/gtk/packet_panes.c
+++ b/ui/gtk/packet_panes.c
@@ -71,6 +71,7 @@
 #include "ui/gtk/old-gtk-compat.h"
 #endif
 
+#include "globals.h"
 
 #define E_BYTE_VIEW_TREE_PTR      "byte_view_tree_ptr"
 #define E_BYTE_VIEW_TREE_VIEW_PTR "byte_view_tree_view_ptr"

diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c
index 98d8bab527b89e4fac57296c630e2f669387ef50..6cf084ac2c5a28b4114a0c60ee4ff83b3802fd22 100644 (file)
--- a/ui/gtk/packet_win.c
+++ b/ui/gtk/packet_win.c
@@ -68,6 +68,8 @@
 
 #include "frame_tvbuff.h"
 
+#include "globals.h"
+
 #define BV_SIZE 75
 #define TV_SIZE 95
 
@@ -157,7 +159,9 @@ redissect_packet_window(gpointer object, gpointer user_data _U_)
        proto_tree_draw(NULL, DataPtr->tree_view);
        epan_dissect_cleanup(&(DataPtr->edt));
        epan_dissect_init(&(DataPtr->edt), cfile.epan, TRUE, TRUE);
-       epan_dissect_run(&(DataPtr->edt), cfile.cd_t, &DataPtr->phdr, frame_tvbuff_new(DataPtr->frame, DataPtr->pd), DataPtr->frame, NULL);
+       epan_dissect_run(&(DataPtr->edt), cfile.cd_t, &DataPtr->phdr,
+           frame_tvbuff_new(&cfile.provider, DataPtr->frame, DataPtr->pd),
+           DataPtr->frame, NULL);
        add_byte_views(&(DataPtr->edt), DataPtr->tree_view, DataPtr->bv_nb_ptr);
        proto_tree_draw(DataPtr->edt.tree, DataPtr->tree_view);
 
@@ -226,7 +230,7 @@ void new_packet_window(GtkWidget *w _U_, gboolean reference, gboolean editable _
 
        epan_dissect_init(&(DataPtr->edt), cfile.epan, TRUE, TRUE);
        epan_dissect_run(&(DataPtr->edt), cfile.cd_t, &DataPtr->phdr,
-                        frame_tvbuff_new(DataPtr->frame, DataPtr->pd),
+                        frame_tvbuff_new(&cfile.provider, DataPtr->frame, DataPtr->pd),
                         DataPtr->frame, &cfile.cinfo);
        epan_dissect_fill_in_columns(&(DataPtr->edt), FALSE, TRUE);
 

diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c
index d597365837f56dff80f7d479e1e2a2fb525c4e68..99098eb23055f1058f31e4bb7a6d636e71f1af07 100644 (file)
--- a/ui/gtk/prefs_dlg.c
+++ b/ui/gtk/prefs_dlg.c
@@ -66,6 +66,8 @@
 #endif
 #endif
 
+#include "globals.h"
+
 static void     prefs_main_ok_cb(GtkWidget *, gpointer);
 static void     prefs_main_apply_cb(GtkWidget *, gpointer);
 static void     prefs_main_save_cb(GtkWidget *, gpointer);

diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c
index 072d177fa1015ccf7071b01ccc6e97a79fc7954b..72ae5ec5c27c51be983f7d56e02d594d054a6688 100644 (file)
--- a/ui/gtk/prefs_gui.c
+++ b/ui/gtk/prefs_gui.c
@@ -43,6 +43,7 @@
 #include "ui/gtk/webbrowser.h"
 #include "ui/gtk/main_welcome.h"
 
+#include "globals.h"
 
 static gint fetch_enum_value(gpointer control, const enum_val_t *enumvals);
 static gboolean fileopen_dir_changed_cb(GtkWidget *myentry, GdkEvent *event _U_, gpointer parent_w _U_);

diff --git a/ui/gtk/print_dlg.c b/ui/gtk/print_dlg.c
index e8f7b5814ab7f75f8b8bf32caabcfc71b54f06f3..ed88fea9e5277d00ec1b1897ee5d968b047bc9dd 100644 (file)
--- a/ui/gtk/print_dlg.c
+++ b/ui/gtk/print_dlg.c
@@ -35,6 +35,8 @@
 #include "ui/util.h"
 #include <wsutil/file_util.h>
 
+#include "globals.h"
+
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/keys.h"
 #include "ui/gtk/gui_utils.h"

diff --git a/ui/gtk/profile_dlg.c b/ui/gtk/profile_dlg.c
index 9f51c79812b6948fc1513f596e94ca3fffbecf46..d6ee0bb2ffb6e11064322e2e19902a5c69855dbc 100644 (file)
--- a/ui/gtk/profile_dlg.c
+++ b/ui/gtk/profile_dlg.c
@@ -23,6 +23,8 @@
 
 #include "config.h"
 
+#include <errno.h>
+
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #if GTK_CHECK_VERSION(3,0,0)

diff --git a/ui/gtk/proto_dlg.c b/ui/gtk/proto_dlg.c
index 012e128be8bff1703cb19eb98c976aa2c4ef2290..e2a03588fe83a837b4a88833fa5e5eee5c45e7c1 100644 (file)
--- a/ui/gtk/proto_dlg.c
+++ b/ui/gtk/proto_dlg.c
@@ -29,10 +29,12 @@
 # include <gdk/gdkkeysyms-compat.h>
 #endif
 
+#include <epan/packet.h>
 #include <epan/prefs.h>
-#include <wsutil/filesystem.h>
 #include <epan/disabled_protos.h>
 
+#include <wsutil/filesystem.h>
+
 #include "ui/util.h"
 
 #include "ui/gtk/main.h"
@@ -42,6 +44,8 @@
 #include "ui/gtk/help_dlg.h"
 #include "simple_dialog.h"
 
+#include "globals.h"
+
 static gboolean set_proto_selection(GtkWidget *);
 static gboolean revert_proto_selection(void);
 

diff --git a/ui/gtk/response_time_delay_table.c b/ui/gtk/response_time_delay_table.c
index e7d8b94ca4eaf48af5e4f584754de345bef19ece..7e4f934299ff4bcb1a4e24fba80aa42720052523 100644 (file)
--- a/ui/gtk/response_time_delay_table.c
+++ b/ui/gtk/response_time_delay_table.c
@@ -42,6 +42,8 @@
 
 #include "ui/gtk/old-gtk-compat.h"
 
+#include "globals.h"
+
 enum
 {
        TYPE_COLUMN,

diff --git a/ui/gtk/rlc_lte_stat_dlg.c b/ui/gtk/rlc_lte_stat_dlg.c
index fde6cf5276065f121dfe80636f1b831ad0960ac9..134661d996faf7913239457f1a2250251ffcc457 100644 (file)
--- a/ui/gtk/rlc_lte_stat_dlg.c
+++ b/ui/gtk/rlc_lte_stat_dlg.c
@@ -54,6 +54,7 @@
 
 #include "ui/recent.h"
 
+#include "globals.h"
 
 void register_tap_listener_rlc_lte_stat(void);
 

diff --git a/ui/gtk/rpc_stat.c b/ui/gtk/rpc_stat.c
index 175460c59034c9ee6b2512a6c35e0355168dab2e..4f1b456878eb1a8c184eb43e0197169cd16ca756 100644 (file)
--- a/ui/gtk/rpc_stat.c
+++ b/ui/gtk/rpc_stat.c
@@ -51,6 +51,8 @@
 
 #include "ui/gtk/old-gtk-compat.h"
 
+#include "globals.h"
+
 void register_tap_listener_gtkrpcstat(void);
 
 /* used to keep track of the statistics for an entire program interface */

diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
index a3f3435631d5478f9d394ec6736788fbaf7651a0..3f05f46f4aea92618465d38cb2bf8f4d5e284243 100644 (file)
--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@@ -62,7 +62,6 @@
 #include "ui/simple_dialog.h"
 #include <wsutil/utf8_entities.h>
 
-
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/file_dlg.h"
@@ -85,6 +84,8 @@
 
 #include "frame_tvbuff.h"
 
+#include "globals.h"
+
 void register_tap_listener_rtp_analysis(void);
 
 enum
@@ -3899,7 +3900,9 @@ rtp_analysis_cb(GtkAction *action _U_, gpointer user_data _U_)
        epan_dissect_init(&edt, cf->epan, TRUE, FALSE);
        epan_dissect_prime_with_dfilter(&edt, sfcode);
        epan_dissect_prime_with_hfid(&edt, hfid_rtp_ssrc);
-       epan_dissect_run(&edt, cf->cd_t, &cf->phdr, frame_tvbuff_new_buffer(fdata, &cf->buf), fdata, NULL);
+       epan_dissect_run(&edt, cf->cd_t, &cf->phdr,
+           frame_tvbuff_new_buffer(&cf->provider, fdata, &cf->buf),
+           fdata, NULL);
 
        /*
         * Packet must be an RTPv2 packet with an SSRC; we use the filter to

diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c
index b942cf3b7256be6cc47becdba7857617bad3cfcb..4d6d98fed1cb3c6d04753bb539bf4c8f0cc31f94 100644 (file)
--- a/ui/gtk/sctp_assoc_analyse.c
+++ b/ui/gtk/sctp_assoc_analyse.c
@@ -39,6 +39,8 @@
 
 #include "frame_tvbuff.h"
 
+#include "globals.h"
+
 static sctp_assoc_info_t static_assoc;
 
 void
@@ -1001,7 +1003,9 @@ sctp_analyse_cb(struct sctp_analyse *u_data, gboolean ext)
 
        epan_dissect_init(&edt, cf->epan, TRUE, FALSE);
        epan_dissect_prime_with_dfilter(&edt, sfcode);
-       epan_dissect_run(&edt, cf->cd_t, &cf->phdr, frame_tvbuff_new_buffer(fdata, &cf->buf), fdata, NULL);
+       epan_dissect_run(&edt, cf->cd_t, &cf->phdr,
+           frame_tvbuff_new_buffer(&cf->provider, fdata, &cf->buf),
+           fdata, NULL);
 
        /* if it is not an sctp packet, show the dialog */
        if (!dfilter_apply_edt(sfcode, &edt)) {

diff --git a/ui/gtk/sctp_byte_graph_dlg.c b/ui/gtk/sctp_byte_graph_dlg.c
index 2cef094fe58449e08c839db3cd4281439c9d31da..8970e011c8d794b3956fee1a003738a571d57466 100644 (file)
--- a/ui/gtk/sctp_byte_graph_dlg.c
+++ b/ui/gtk/sctp_byte_graph_dlg.c
@@ -40,6 +40,8 @@
 #include "ui/gtk/stock_icons.h"
 #include "ui/gtk/old-gtk-compat.h"
 
+#include "globals.h"
+
 #define DEFAULT_PIXELS_PER_TICK 2
 #define MAX_PIXELS_PER_TICK     4
 #define AUTO_MAX_YSCALE         0

diff --git a/ui/gtk/sctp_chunk_stat.c b/ui/gtk/sctp_chunk_stat.c
index edb5de543d46cfbcd83f112ce04ed61415076ebf..54b2b1af5df1aaa6d58aa7f3de4ef742186b41f6 100644 (file)
--- a/ui/gtk/sctp_chunk_stat.c
+++ b/ui/gtk/sctp_chunk_stat.c
@@ -27,7 +27,6 @@
 
 #include <string.h>
 
-
 #include <epan/to_str.h>
 #include <epan/value_string.h>
 #include <epan/tap.h>
@@ -41,6 +40,8 @@
 #include "ui/gtk/main.h"
 #include "ui/gtk/sctp_stat_gtk.h"
 
+#include "globals.h"
+
 void register_tap_listener_sctpstat(void);
 static void sctpstat_init(const char *opt_arg, void *userdata);
 

diff --git a/ui/gtk/sctp_chunk_stat_dlg.c b/ui/gtk/sctp_chunk_stat_dlg.c
index 7ff8fb32e45cbf20cf5619b613ef9791f08d389b..8acf310d038185eb8623ef76b5b2141d597d4d9f 100644 (file)
--- a/ui/gtk/sctp_chunk_stat_dlg.c
+++ b/ui/gtk/sctp_chunk_stat_dlg.c
@@ -28,12 +28,13 @@
 
 #include "epan/to_str.h"
 
-
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/sctp_stat_gtk.h"
 #include "ui/gtk/stock_icons.h"
 
+#include "globals.h"
+
 static GtkWidget         *clist           = NULL;
 static GList             *last_list       = NULL;
 static sctp_assoc_info_t *selected_stream = NULL; /* current selection */

diff --git a/ui/gtk/sctp_error_dlg.c b/ui/gtk/sctp_error_dlg.c
index e9c72137f9bb05e5e6a32cc0068ab6efca954dca..1e2df622f49fa78c98e391d33cdb2a84f5f1734d 100644 (file)
--- a/ui/gtk/sctp_error_dlg.c
+++ b/ui/gtk/sctp_error_dlg.c
@@ -32,6 +32,8 @@
 #include "ui/gtk/sctp_stat_gtk.h"
 #include "ui/gtk/stock_icons.h"
 
+#include "globals.h"
+
 static GtkWidget *sctp_error_dlg=NULL;
 static GtkWidget *clist = NULL;
 static GList *last_list = NULL;

diff --git a/ui/gtk/sctp_graph_dlg.c b/ui/gtk/sctp_graph_dlg.c
index 21809e7c0d1423256d09c35558b053a445a231f4..9fde663b14dbeeaa3ae756151058c3f86fc3c5cb 100644 (file)
--- a/ui/gtk/sctp_graph_dlg.c
+++ b/ui/gtk/sctp_graph_dlg.c
@@ -39,6 +39,8 @@
 #include "ui/gtk/stock_icons.h"
 #include "ui/gtk/old-gtk-compat.h"
 
+#include "globals.h"
+
 #define DEFAULT_PIXELS_PER_TICK 2
 #define MAX_PIXELS_PER_TICK     4
 #define AUTO_MAX_YSCALE         0

diff --git a/ui/gtk/sctp_stat_dlg.c b/ui/gtk/sctp_stat_dlg.c
index de1362ac9757b8c40f9036cc1480176015f2ed13..04ade4faa1b11ba9af03e0d0413987749c282606 100644 (file)
--- a/ui/gtk/sctp_stat_dlg.c
+++ b/ui/gtk/sctp_stat_dlg.c
@@ -38,6 +38,8 @@
 #include "ui/gtk/old-gtk-compat.h"
 #include "ui/gtk/stock_icons.h"
 
+#include "globals.h"
+
 static GtkWidget *sctp_stat_dlg = NULL;
 static GtkWidget *clist                = NULL;
 static GList    *last_list     = NULL;

diff --git a/ui/gtk/service_response_time_table.c b/ui/gtk/service_response_time_table.c
index 590c01a2c75e27524e70b30506655b5b0efbc4d2..1a3884e3cd3ad3b4aa1ee554f3c15d5e81d20592 100644 (file)
--- a/ui/gtk/service_response_time_table.c
+++ b/ui/gtk/service_response_time_table.c
@@ -45,6 +45,8 @@
 #include "epan/conversation.h"
 #include "epan/dissectors/packet-scsi.h"
 
+#include "globals.h"
+
 #define NANOSECS_PER_SEC 1000000000
 
 enum

diff --git a/ui/gtk/simple_stattable.c b/ui/gtk/simple_stattable.c
index 7ba64658f09cc955dbbb10371c155585c562470f..3ab99ca084dc35b4aa244ea497bbcdc3cc581fa2 100644 (file)
--- a/ui/gtk/simple_stattable.c
+++ b/ui/gtk/simple_stattable.c
@@ -42,6 +42,8 @@
 
 #include "ui/gtk/old-gtk-compat.h"
 
+#include "globals.h"
+
 typedef struct _gtk_simplestat_t {
        GtkWidget *vbox;
        GtkWidget *win;

diff --git a/ui/gtk/stats_tree_stat.c b/ui/gtk/stats_tree_stat.c
index b2420fd96b2d6c43c29394e359baa5de17debe9b..9be6bbdd07768e42070b093f2c2c3e6ba37004cd 100644 (file)
--- a/ui/gtk/stats_tree_stat.c
+++ b/ui/gtk/stats_tree_stat.c
@@ -62,6 +62,8 @@
 #include "ui/win32/file_dlg_win32.h"
 #endif
 
+#include "globals.h"
+
 void register_tap_listener_stats_tree_stat(void);
 
 struct _st_node_pres {

diff --git a/ui/gtk/summary_dlg.c b/ui/gtk/summary_dlg.c
index 990b9df8e565e1ad9a4dd176ad1a7bc42e444ee0..2a7bfe7f9975e058a1e35d34e05f3cbbc84df4d0 100644 (file)
--- a/ui/gtk/summary_dlg.c
+++ b/ui/gtk/summary_dlg.c
@@ -26,8 +26,6 @@
 
 #include <gtk/gtk.h>
 
-
-
 #include <version_info.h>
 
 #include "../../file.h"
@@ -45,6 +43,8 @@
 #include "ui/gtk/help_dlg.h"
 #include "ui/gtk/packet_list.h"
 
+#include "globals.h"
+
 #define SUM_STR_MAX      1024
 #define FILTER_SNIP_LEN    50
 #define SHB_STR_SNIP_LEN   50

diff --git a/ui/gtk/supported_protos_dlg.c b/ui/gtk/supported_protos_dlg.c
index d1eda40d529f638453937cedf88da58432f0a3c8..e34aad9027f055a15dd0f8beb0f6a0651a9fd7be 100644 (file)
--- a/ui/gtk/supported_protos_dlg.c
+++ b/ui/gtk/supported_protos_dlg.c
@@ -27,17 +27,14 @@
 
 #include <gtk/gtk.h>
 
+#include <epan/proto.h>
 #include <epan/prefs.h>
 
-#include "../../globals.h"
-
 #include "ui/gtk/supported_protos_dlg.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/font_utils.h"
 
-
-
 static const char *proto_supported =
 "The following %d protocols (and packet types) are currently\n"
 "supported by Wireshark:\n\n";

diff --git a/ui/gtk/uat_gui.c b/ui/gtk/uat_gui.c
index d18e840d62a82a97137f432280f6b16f84e77e3e..0b67d38d2641474f8074cf99e316f65444f2abcc 100644 (file)
--- a/ui/gtk/uat_gui.c
+++ b/ui/gtk/uat_gui.c
@@ -68,6 +68,8 @@
 #include "ui/gtk/old-gtk-compat.h"
 #include "ui/gtk/packet_win.h"
 
+#include "globals.h"
+
 # define BUTTON_SIZE_X -1
 # define BUTTON_SIZE_Y -1
 

diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c
index e95254c2deab0ff07fc8ee8363badd3adfb5872d..56e5d5630673f2a3dade4ab651c5c157d88e8b1f 100644 (file)
--- a/ui/gtk/wlan_stat_dlg.c
+++ b/ui/gtk/wlan_stat_dlg.c
@@ -50,6 +50,8 @@
 
 #include "ui/gtk/old-gtk-compat.h"
 
+#include "globals.h"
+
 void register_tap_listener_wlanstat(void);
 
 enum {

diff --git a/ui/proto_hier_stats.c b/ui/proto_hier_stats.c
index e58c6f1ba5b981e8bd45566ec90c2c7c4f3245b8..66a550b491507474f9112ce74a59f9c2ab0fa8d1 100644 (file)
--- a/ui/proto_hier_stats.c
+++ b/ui/proto_hier_stats.c
@@ -165,7 +165,9 @@ process_record(capture_file *cf, frame_data *frame, column_info *cinfo, ph_stats
     epan_dissect_init(&edt, cf->epan, TRUE, FALSE);
     /* Don't fake protocols. We need them for the protocol hierarchy */
     epan_dissect_fake_protocols(&edt, FALSE);
-    epan_dissect_run(&edt, cf->cd_t, &phdr, frame_tvbuff_new_buffer(frame, &buf), frame, cinfo);
+    epan_dissect_run(&edt, cf->cd_t, &phdr,
+                     frame_tvbuff_new_buffer(&cf->provider, frame, &buf),
+                     frame, cinfo);
 
     /* Get stats from this protocol tree */
     process_tree(edt.tree, ps);

diff --git a/ui/qt/address_editor_frame.cpp b/ui/qt/address_editor_frame.cpp
index a56464b76eebb35dda2489833d90e9b477bd87a2..45f4ad0ec2e53b3d66bf5927b83e1a5c98e78068 100644 (file)
--- a/ui/qt/address_editor_frame.cpp
+++ b/ui/qt/address_editor_frame.cpp
@@ -83,7 +83,8 @@ void AddressEditorFrame::editAddresses(CaptureFile &cf, int column)
     col_custom_prime_edt(&edt, &cap_file_->cinfo);
 
     epan_dissect_run(&edt, cap_file_->cd_t, &cap_file_->phdr,
-        frame_tvbuff_new_buffer(cap_file_->current_frame, &cap_file_->buf), cap_file_->current_frame, &cap_file_->cinfo);
+        frame_tvbuff_new_buffer(&cap_file_->provider, cap_file_->current_frame, &cap_file_->buf),
+        cap_file_->current_frame, &cap_file_->cinfo);
     epan_dissect_fill_in_columns(&edt, TRUE, TRUE);
 
     /* First check selected column */

diff --git a/ui/qt/export_pdu_dialog.cpp b/ui/qt/export_pdu_dialog.cpp
index 7316c680a7c40956ed536c0517a3eaf1682e613b..98edce311f838183d00ec174a04b43a8d174de0d 100644 (file)
--- a/ui/qt/export_pdu_dialog.cpp
+++ b/ui/qt/export_pdu_dialog.cpp
@@ -25,7 +25,6 @@
 #include "export_pdu_dialog.h"
 #include <ui_export_pdu_dialog.h>
 
-#include "globals.h"
 #include <wiretap/pcap-encap.h>
 
 #include <epan/tap.h>

diff --git a/ui/qt/gsm_map_summary_dialog.cpp b/ui/qt/gsm_map_summary_dialog.cpp
index e32ee545f41ab5a03b4a09a9a734dbd17b31bc72..a7a00d62a1cb01ce8b0bbc7e9f7113fb1fddcb61 100644 (file)
--- a/ui/qt/gsm_map_summary_dialog.cpp
+++ b/ui/qt/gsm_map_summary_dialog.cpp
@@ -30,7 +30,6 @@
 
 #include <glib.h>
 
-#include "globals.h"
 #include "summary.h"
 
 #include <epan/packet.h>

diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp
index 92707f8cd3d9b89b11d226e86cf11af3e4151e70..2958ad95abfc08c271131d753e39068fea5aeb0a 100644 (file)
--- a/ui/qt/iax2_analysis_dialog.cpp
+++ b/ui/qt/iax2_analysis_dialog.cpp
@@ -335,7 +335,8 @@ Iax2AnalysisDialog::Iax2AnalysisDialog(QWidget &parent, CaptureFile &cf) :
     epan_dissect_init(&edt, cap_file_.capFile()->epan, TRUE, FALSE);
     epan_dissect_prime_with_dfilter(&edt, sfcode);
     epan_dissect_run(&edt, cap_file_.capFile()->cd_t, &cap_file_.capFile()->phdr,
-                     frame_tvbuff_new_buffer(fdata, &cap_file_.capFile()->buf), fdata, NULL);
+                     frame_tvbuff_new_buffer(&cap_file_.capFile()->provider, fdata, &cap_file_.capFile()->buf),
+                     fdata, NULL);
 
     // This shouldn't happen (the menu item should be disabled) but check anyway
     if (!dfilter_apply_edt(sfcode, &edt)) {

diff --git a/ui/qt/lte_rlc_graph_dialog.cpp b/ui/qt/lte_rlc_graph_dialog.cpp
index 71478dddfbe5edfdae7c3c9fb0229d16ebcb56dd..922a9bcb37fff2ef98e85b9a90898c1f86d926e1 100644 (file)
--- a/ui/qt/lte_rlc_graph_dialog.cpp
+++ b/ui/qt/lte_rlc_graph_dialog.cpp
@@ -40,8 +40,6 @@
 #include "wireshark_application.h"
 #include "simple_dialog.h"
 
-#include "globals.h"
-
 #include <epan/dissectors/packet-rlc-lte.h>
 
 #include <ui/tap-rlc-graph.h>

diff --git a/ui/qt/models/packet_list_record.cpp b/ui/qt/models/packet_list_record.cpp
index 8e1551071bc696074bc77a0fe8b7a7c346f0d630..176e6d5998c9139e9cdcd4346316655b5c094000 100644 (file)
--- a/ui/qt/models/packet_list_record.cpp
+++ b/ui/qt/models/packet_list_record.cpp
@@ -185,7 +185,9 @@ void PacketListRecord::dissect(capture_file *cap_file, bool dissect_color)
      * XXX - need to catch an OutOfMemoryError exception and
      * attempt to recover from it.
      */
-    epan_dissect_run(&edt, cap_file->cd_t, &phdr, frame_tvbuff_new_buffer(fdata_, &buf), fdata_, cinfo);
+    epan_dissect_run(&edt, cap_file->cd_t, &phdr,
+                     frame_tvbuff_new_buffer(&cap_file->provider, fdata_, &buf),
+                     fdata_, cinfo);
 
     if (dissect_columns) {
         /* "Stringify" non frame_data vals */

diff --git a/ui/qt/mtp3_summary_dialog.cpp b/ui/qt/mtp3_summary_dialog.cpp
index b97294f78eb1eb3f867eea2344a66af2aebb611e..9b30cbd533addf1e7e15b782b910d733669564d9 100644 (file)
--- a/ui/qt/mtp3_summary_dialog.cpp
+++ b/ui/qt/mtp3_summary_dialog.cpp
@@ -30,7 +30,6 @@
 
 #include <glib.h>
 
-#include "globals.h"
 #include "summary.h"
 
 #include <epan/tap.h>

diff --git a/ui/qt/packet_dialog.cpp b/ui/qt/packet_dialog.cpp
index ea17a20cd41c80787c205708b93f3f8db0c88979..bf3e481b58dd19fd0d7d4d5179b10c7096b21ab0 100644 (file)
--- a/ui/qt/packet_dialog.cpp
+++ b/ui/qt/packet_dialog.cpp
@@ -63,7 +63,7 @@ PacketDialog::PacketDialog(QWidget &parent, CaptureFile &cf, frame_data *fdata)
     col_custom_prime_edt(&edt_, &(cap_file_.capFile()->cinfo));
 
     epan_dissect_run(&edt_, cap_file_.capFile()->cd_t, &phdr_,
-                     frame_tvbuff_new(fdata, packet_data_),
+                     frame_tvbuff_new(&cap_file_.capFile()->provider, fdata, packet_data_),
                      fdata, &(cap_file_.capFile()->cinfo));
     epan_dissect_fill_in_columns(&edt_, TRUE, TRUE);
 

diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index 7163a10a20f479b03f4646ba76c89a24544874f9..a7966b7f3328b8e323acf9ad9684e90c8045c63c 100644 (file)
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -1024,7 +1024,9 @@ QString PacketList::getFilterFromRowAndColumn()
         epan_dissect_init(&edt, cap_file_->epan, have_custom_cols(&cap_file_->cinfo), FALSE);
         col_custom_prime_edt(&edt, &cap_file_->cinfo);
 
-        epan_dissect_run(&edt, cap_file_->cd_t, &cap_file_->phdr, frame_tvbuff_new_buffer(fdata, &cap_file_->buf), fdata, &cap_file_->cinfo);
+        epan_dissect_run(&edt, cap_file_->cd_t, &cap_file_->phdr,
+                         frame_tvbuff_new_buffer(&cap_file_->provider, fdata, &cap_file_->buf),
+                         fdata, &cap_file_->cinfo);
         epan_dissect_fill_in_columns(&edt, TRUE, TRUE);
 
         if ((cap_file_->cinfo.columns[ctx_column_].col_custom_occurrence) ||

diff --git a/ui/qt/rtp_analysis_dialog.cpp b/ui/qt/rtp_analysis_dialog.cpp
index 145fad1f7577a0ce7233f931738d8fe64a2b1ca9..bdc8c4417923015d0d5e5d285fff48218fe65e17 100644 (file)
--- a/ui/qt/rtp_analysis_dialog.cpp
+++ b/ui/qt/rtp_analysis_dialog.cpp
@@ -1607,7 +1607,8 @@ void RtpAnalysisDialog::findStreams()
     epan_dissect_prime_with_dfilter(&edt, sfcode);
     epan_dissect_prime_with_hfid(&edt, hfid_rtp_ssrc);
     epan_dissect_run(&edt, cap_file_.capFile()->cd_t, &cap_file_.capFile()->phdr,
-                     frame_tvbuff_new_buffer(fdata, &cap_file_.capFile()->buf), fdata, NULL);
+                     frame_tvbuff_new_buffer(&cap_file_.capFile()->provider, fdata, &cap_file_.capFile()->buf),
+                     fdata, NULL);
 
     /*
      * Packet must be an RTPv2 packet with an SSRC; we use the filter to

diff --git a/ui/qt/utils/frame_information.cpp b/ui/qt/utils/frame_information.cpp
index c81b6736c2f3717e5cf1747212d80e0179565c5a..5f2aa8277e98edd3eee345e5dab1b0449ed0aba0 100644 (file)
--- a/ui/qt/utils/frame_information.cpp
+++ b/ui/qt/utils/frame_information.cpp
@@ -61,7 +61,7 @@ void FrameInformation::loadFrameTree()
     col_custom_prime_edt(&edt_, &(cap_file_->capFile()->cinfo));
 
     epan_dissect_run(&edt_, cap_file_->capFile()->cd_t, &phdr_,
-                     frame_tvbuff_new(fi_, packet_data_),
+                     frame_tvbuff_new(&cap_file_->capFile()->provider, fi_, packet_data_),
                      fi_, &(cap_file_->capFile()->cinfo));
     epan_dissect_fill_in_columns(&edt_, TRUE, TRUE);
 }

diff --git a/ui/tap-rlc-graph.c b/ui/tap-rlc-graph.c
index 5ff9676e9dd7546ecfbe1c73fa7c3697c5ba1c81..817b4c08e9740217a2cccf6f4b0ea3e30a7d701d 100644 (file)
--- a/ui/tap-rlc-graph.c
+++ b/ui/tap-rlc-graph.c
@@ -146,7 +146,9 @@ rlc_lte_tap_info *select_rlc_lte_session(capture_file *cf,
 
     epan_dissect_init(&edt, cf->epan, TRUE, FALSE);
     epan_dissect_prime_with_dfilter(&edt, sfcode);
-    epan_dissect_run_with_taps(&edt, cf->cd_t, &cf->phdr, frame_tvbuff_new_buffer(fdata, &cf->buf), fdata, NULL);
+    epan_dissect_run_with_taps(&edt, cf->cd_t, &cf->phdr,
+                               frame_tvbuff_new_buffer(&cf->provider, fdata, &cf->buf),
+                               fdata, NULL);
     rel_ts = edt.pi.rel_ts;
     epan_dissect_cleanup(&edt);
     remove_tap_listener(&th);

diff --git a/ui/tap-rtp-common.c b/ui/tap-rtp-common.c
index 28fea44e249536947afb5cb5d20b759a6bb4181f..2fd78d70b977bf897208fbc92f3b533ec48882f3 100644 (file)
--- a/ui/tap-rtp-common.c
+++ b/ui/tap-rtp-common.c
@@ -20,7 +20,6 @@
 #include <glib.h>
 
 #include <math.h>
-#include "globals.h"
 
 #include <string.h>
 #include <epan/rtp_pt.h>

diff --git a/ui/tap-tcp-stream.c b/ui/tap-tcp-stream.c
index 69b7a87ee7f5da608a3e2b5a26d32c53580b6523..3f17c4389669215363a74ef83504fb315691b87d 100644 (file)
--- a/ui/tap-tcp-stream.c
+++ b/ui/tap-tcp-stream.c
@@ -319,7 +319,9 @@ select_tcpip_session(capture_file *cf, struct segment *hdrs)
 
     epan_dissect_init(&edt, cf->epan, TRUE, FALSE);
     epan_dissect_prime_with_dfilter(&edt, sfcode);
-    epan_dissect_run_with_taps(&edt, cf->cd_t, &cf->phdr, frame_tvbuff_new_buffer(fdata, &cf->buf), fdata, NULL);
+    epan_dissect_run_with_taps(&edt, cf->cd_t, &cf->phdr,
+                               frame_tvbuff_new_buffer(&cf->provider, fdata, &cf->buf),
+                               fdata, NULL);
     rel_ts = edt.pi.rel_ts;
     epan_dissect_cleanup(&edt);
     remove_tap_listener(&th);

diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c
index d5e9b23a4953bfee46b9444c4960b0ded867c38d..e538545140b39d6013e244fa35e553c1007e7d7e 100644 (file)
--- a/ui/tap_export_pdu.c
+++ b/ui/tap_export_pdu.c
@@ -22,8 +22,6 @@
 
 #include "config.h"
 
-
-#include "globals.h"
 #include "wiretap/pcap-encap.h"
 #include "wsutil/os_version_info.h"
 #include "version_info.h"

diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c
index 5ac3afecb9764ce2435b4b977ac1acef779d0c2a..ebfc57590043305a5026409a8391bc4ff9534f5a 100644 (file)
--- a/ui/win32/file_dlg_win32.c
+++ b/ui/win32/file_dlg_win32.c
@@ -19,7 +19,7 @@
 #include <richedit.h>
 #include <strsafe.h>
 
-#include "file.h"
+#include "globals.h"
 
 #include "wsutil/file_util.h"
 #include "wsutil/str_util.h"