Use cfile.h to define the capture_file type.

Have cfile-int.h declare the structure, and use it in files that
directly access the structure.

Have cfile.h just incompletely declare the structure and include it
rather than explicitly declaring it in source files or other header
files.

Never directly refer to struct _capture_file except when typedeffing
capture_file.

Add #includes as necessary, now that cfile.h doesn't drag in a ton of

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

1 files changed, 5 insertions, 74 deletions

diff --git a/cfile.h b/cfile.h
index 8f323648bb..7a3c39d17a 100644
--- a/cfile.h
+++ b/cfile.h
@@ -11,12 +11,7 @@
 #ifndef __CFILE_H__
 #define __CFILE_H__
 
-#include <epan/epan.h>
-#include <epan/column-info.h>
-#include <epan/dfilter/dfilter.h>
-#include <epan/frame_data.h>
-#include <epan/frame_data_sequence.h>
-#include <wiretap/wtap.h>
+#include <glib.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -43,77 +38,13 @@ typedef enum {
   SD_BACKWARD
 } search_direction;
 
-typedef struct _capture_file {
-  epan_t      *epan;
-  file_state   state;                /* Current state of capture file */
-  gchar       *filename;             /* Name of capture file */
-  gchar       *source;               /* Temp file source, e.g. "Pipe from elsewhere" */
-  gboolean     is_tempfile;          /* Is capture file a temporary file? */
-  gboolean     unsaved_changes;      /* Does the capture file have changes that have not been saved? */
-  gboolean     stop_flag;            /* Stop current processing (loading, searching, etc.) */
-
-  gint64       f_datalen;            /* Size of capture file data (uncompressed) */
-  guint16      cd_t;                 /* File type of capture file */
-  unsigned int open_type;            /* open_routine index+1 used, if selected, or WTAP_TYPE_AUTO */
-  gboolean     iscompressed;         /* TRUE if the file is compressed */
-  int          lnk_t;                /* File link-layer type; could be WTAP_ENCAP_PER_PACKET */
-  GArray      *linktypes;            /* Array of packet link-layer types */
-  guint32      count;                /* Total number of frames */
-  guint64      packet_comment_count; /* Number of comments in frames (could be >1 per frame... */
-  guint32      displayed_count;      /* Number of displayed frames */
-  guint32      marked_count;         /* Number of marked frames */
-  guint32      ignored_count;        /* Number of ignored frames */
-  guint32      ref_time_count;       /* Number of time referenced frames */
-  gboolean     drops_known;          /* TRUE if we know how many packets were dropped */
-  guint32      drops;                /* Dropped packets */
-  nstime_t     elapsed_time;         /* Elapsed time */
-  int          snap;                 /* Maximum captured packet length; 0 if unknown */
-  wtap        *wth;                  /* Wiretap session */
-  dfilter_t   *rfcode;               /* Compiled read filter program */
-  dfilter_t   *dfcode;               /* Compiled display filter program */
-  gchar       *dfilter;              /* Display filter string */
-  gboolean     redissecting;         /* TRUE if currently redissecting (cf_redissect_packets) */
-  /* search */
-  gchar       *sfilter;              /* Filter, hex value, or string being searched */
-  gboolean     hex;                  /* TRUE if "Hex value" search was last selected */
-  gboolean     string;               /* TRUE if "String" search was last selected */
-  gboolean     summary_data;         /* TRUE if "String" search in "Packet list" (Info column) was last selected */
-  gboolean     decode_data;          /* TRUE if "String" search in "Packet details" was last selected */
-  gboolean     packet_data;          /* TRUE if "String" search in "Packet data" was last selected */
-  guint32      search_pos;           /* Byte position of last byte found in a hex search */
-  guint32      search_len;           /* Length of bytes matching the search */
-  gboolean     case_type;            /* TRUE if case-insensitive text search */
-  GRegex      *regex;                /* Set if regular expression search */
-  search_charset_t scs_type;         /* Character set for text search */
-  search_direction dir;              /* Direction in which to do searches */
-  gboolean     search_in_progress;   /* TRUE if user just clicked OK in the Find dialog or hit <control>N/B */
-  /* packet data */
-  struct wtap_pkthdr phdr;           /* Packet header */
-  Buffer       buf;                  /* Packet data */
-  /* frames */
-  frame_data_sequence *frames;       /* Sequence of frames, if we're keeping that information */
-  guint32      first_displayed;      /* Frame number of first frame displayed */
-  guint32      last_displayed;       /* Frame number of last frame displayed */
-  column_info  cinfo;                /* Column formatting information */
-  gboolean     columns_changed;      /**< Have the columns been changed in the prefs? (GTK+ only) */
-  frame_data  *current_frame;        /* Frame data for current frame */
-  gint         current_row;          /* Row number for current frame */
-  epan_dissect_t *edt;               /* Protocol dissection for currently selected packet */
-  field_info  *finfo_selected;       /* Field info for currently selected field */
-  gpointer     window;               /* Top-level window associated with file */
-  GTree       *frames_user_comments; /* BST with user comments for frames (key = frame_data) */
-  gulong       computed_elapsed;     /* Elapsed time to load the file (in msec). */
-
-  guint32      cum_bytes;
-  const frame_data *ref;
-  frame_data  *prev_dis;
-  frame_data  *prev_cap;
-} capture_file;
+struct _capture_file;
+typedef struct _capture_file capture_file;
 
 extern void cap_file_init(capture_file *cf);
 
-extern const char *cap_file_get_interface_name(struct _capture_file *cf, guint32 interface_id);
-extern const char *cap_file_get_interface_description(struct _capture_file *cf, guint32 interface_id);
+extern const char *cap_file_get_interface_name(capture_file *cf, guint32 interface_id);
+extern const char *cap_file_get_interface_description(capture_file *cf, guint32 interface_id);
 
 #ifdef __cplusplus
 }