diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-12-08 00:30:55 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-12-08 08:31:41 +0000 |
| commit | 8aa14236f8b0ea69901ea9ed87ebabd0d278e973 (patch) | |
| tree | b49b5d6b0ee5d647cf33054c5f280d2dc4fa4f99 /rawshark.c | |
| parent | f29b3deb6d867b16fb8bc4bd5f66a5b6326a6727 (diff) | |
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>
Diffstat (limited to 'rawshark.c')
| -rw-r--r-- | rawshark.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/rawshark.c b/rawshark.c index eb382fd5ba..68dedaddd4 100644 --- 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; |