Move the parts of a capture_file used by libwireshark to a new structure.

Embed one of those structures in a capture_file, and have a struct
epan_session point to that structure rather than to a capture_file.
Pass that structure to the routines that fetch data that libwireshark
uses when dissecting.

That separates the stuff that libwireshark expects from the stuff that
it doesn't look at.

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

1 files changed, 5 insertions, 5 deletions

diff --git a/ui/packet_range.c b/ui/packet_range.c
index c6b9335e5f..a39af2ced1 100644
--- a/ui/packet_range.c
+++ b/ui/packet_range.c
@@ -80,7 +80,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->frames != NULL) {
+    if (range->cf->frame_set_info.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.
@@ -91,7 +91,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->frames, framenum);
+            packet = frame_data_sequence_find(range->cf->frame_set_info.frames, framenum);
 
             if (range->cf->current_frame == packet) {
                 range->selected_packet = framenum;
@@ -136,7 +136,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->frames, framenum);
+            packet = frame_data_sequence_find(range->cf->frame_set_info.frames, framenum);
 
             if (framenum >= mark_low &&
                 framenum <= mark_high)
@@ -205,9 +205,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->frames != NULL) {
+    if (range->cf->frame_set_info.frames != NULL) {
         for(framenum = 1; framenum <= range->cf->count; framenum++) {
-            packet = frame_data_sequence_find(range->cf->frames, framenum);
+            packet = frame_data_sequence_find(range->cf->frame_set_info.frames, framenum);
 
             if (value_is_in_range(range->user_range, framenum)) {
                 range->user_range_cnt++;