X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=blobdiff_plain;f=cfile.h;h=730da187c78064797a9dccebbbac4264b81ba7e7;hp=a14accc9e16223fef934ea127de49a6566b56c6b;hb=d9bd6b6f4469d6c090a07eb657392529f53f4833;hpb=5934fb198447b7c5748ba6c632cbd9ab4800b185

diff --git a/cfile.h b/cfile.h
index a14accc9e1..730da187c7 100644
--- a/cfile.h
+++ b/cfile.h
@@ -25,6 +25,12 @@
 #ifndef __CFILE_H__
 #define __CFILE_H__
 
+#include "frame_data_sequence.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /* Current state of file. */
 typedef enum {
   FILE_CLOSED,	                /* No file open */
@@ -98,7 +104,7 @@ typedef struct _capture_file {
   union wtap_pseudo_header pseudo_header; /* Packet pseudo_header */
   guint8       pd[WTAP_MAX_PACKET_SIZE];  /* Packet data */
   /* frames */
-  void        *ptree_root;      /* Pointer to the root node */
+  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 */
@@ -106,22 +112,15 @@ typedef struct _capture_file {
   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 */
+#ifdef WANT_PACKET_EDITOR
+  GTree       *edited_frames;   /* BST with modified frames */
+#endif
 } capture_file;
 
 extern void cap_file_init(capture_file *cf);
 
-extern frame_data *cap_file_add_fdata(capture_file *cf, frame_data *fdata);
-
-/*
- * Find the frame_data for the specified frame number.
- * Do some caching to make this work reasonably fast for
- * forward and backward sequential passes through the packets.
- */
-extern frame_data *cap_file_find_fdata(capture_file *cf, guint32 num);
-
-/*
- * Free up all the frame information for a capture file.
- */
-extern void cap_file_free_frames(capture_file *cf);
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 
 #endif /* cfile.h */