diff options
author | Guy Harris <guy@alum.mit.edu> | 2017-12-07 19:31:43 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2017-12-08 03:32:25 +0000 |
commit | 797d2f6a87607b146a2ef62e1ff501031dce8212 (patch) | |
tree | 7c18adbd5b86d5f2843dd760f6fa492f7c05fef4 /ui/packet_range.c | |
parent | 0baa4458c5780b143ad4479d387202ddf4add06f (diff) |
Move the frame_set stuff back into the capture_file structure.
libwireshark now expects an epan_t to be created with a pointer to a
"packet provider" structure; that structure is opaque within
libwireshark, and a pointer to it is passed to the callbacks that
provide interface names, interface, descriptions, user comments, and
packet time stamps, and that set user comments. The code that calls
epan_new() is expected to provide those callbacks, and to define the
structure, which can be used by the providers. If none of the callbacks
need that extra information, the "packet provider" structure can be
null.
Have a "file" packet provider for all the programs that provide packets
from a file.
Change-Id: I4b5709a3dd7b098ebd7d2a7d95bcdd7b5903c1a0
Reviewed-on: https://code.wireshark.org/review/24731
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/packet_range.c')
-rw-r--r-- | ui/packet_range.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/packet_range.c b/ui/packet_range.c index 90b89467fb..db9b5919e2 100644 --- a/ui/packet_range.c +++ b/ui/packet_range.c @@ -78,7 +78,7 @@ static void packet_range_calc(packet_range_t *range) { * the capture_file structure, updating them whenever we * filter the display, etc.. */ - if (range->cf->frame_set_info.frames != NULL) { + if (range->cf->provider.frames != NULL) { /* The next for-loop is used to obtain the amount of packets * to be processed and is used to present the information in * the Save/Print As widget. @@ -89,7 +89,7 @@ static void packet_range_calc(packet_range_t *range) { */ for(framenum = 1; framenum <= range->cf->count; framenum++) { - packet = frame_data_sequence_find(range->cf->frame_set_info.frames, framenum); + packet = frame_data_sequence_find(range->cf->provider.frames, framenum); if (range->cf->current_frame == packet) { range->selected_packet = framenum; @@ -134,7 +134,7 @@ static void packet_range_calc(packet_range_t *range) { } for(framenum = 1; framenum <= range->cf->count; framenum++) { - packet = frame_data_sequence_find(range->cf->frame_set_info.frames, framenum); + packet = frame_data_sequence_find(range->cf->provider.frames, framenum); if (framenum >= mark_low && framenum <= mark_high) @@ -203,9 +203,9 @@ static void packet_range_calc_user(packet_range_t *range) { * help, but if the user specified about *half* the packets in * the range, that won't help, either. */ - if (range->cf->frame_set_info.frames != NULL) { + if (range->cf->provider.frames != NULL) { for(framenum = 1; framenum <= range->cf->count; framenum++) { - packet = frame_data_sequence_find(range->cf->frame_set_info.frames, framenum); + packet = frame_data_sequence_find(range->cf->provider.frames, framenum); if (value_is_in_range(range->user_range, framenum)) { range->user_range_cnt++; |