Add APIs to Wiretap to return the file of the size as supplied by the OS

[metze/wireshark/wip.git] / cfile.h

diff --git a/cfile.h b/cfile.h
index bcb5938e96c2516e3ab614c602e9145acc626720..59f60bb51ffc35e494cdc578c72e828131d3dcf7 100644 (file)
--- a/cfile.h
+++ b/cfile.h
@@ -43,11 +43,11 @@ typedef enum {
 
 typedef struct _capture_file {
   file_state   state;     /* Current state of capture file */
-  int          filed;     /* File descriptor of capture file */
   gchar       *filename;  /* Name of capture file */
   gboolean     is_tempfile; /* Is capture file a temporary file? */
   gboolean     user_saved;/* If capture file is temporary, has it been saved by user yet? */
-  long         f_len;     /* Length of capture file */
+  long         f_datalen; /* Size of capture file data (uncompressed) */
+  gint64       f_len;     /* Length of capture file (compressed if file is) */
   guint16      cd_t;      /* File type of capture file */
   int          lnk_t;     /* Link-layer type with which to save capture */
   guint32      vers;      /* Version.  For tcpdump minor is appended to major */
@@ -60,16 +60,10 @@ typedef struct _capture_file {
   guint32      eusec;     /* Elapsed microseconds */
   gboolean     has_snap;  /* TRUE if maximum capture packet length is known */
   int          snap;      /* Maximum captured packet length */
-  gchar       *iface;     /* Interface */
-  gchar       *save_file; /* File that user saved capture to */
-  int          save_file_fd; /* File descriptor for saved file */
   wtap        *wth;       /* Wiretap session */
-  dfilter_t   *rfcode;    /* Compiled read filter program */
+  dfilter_t   *rfcode;    /* Compiled read (display) filter program */
   gchar       *dfilter;   /* Display filter string */
   dfilter_t   *dfcode;    /* Compiled display filter program */
-#ifdef HAVE_LIBPCAP
-  gchar       *cfilter;   /* Capture filter string */
-#endif
   gchar       *sfilter;   /* Search filter string */
   gboolean     sbackward; /* TRUE if search is backward, FALSE if forward */
   gboolean     hex;       /* TRUE is raw data search is being performed */