Add ability to follow UDP stream by index

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

diff --git a/cfile.h b/cfile.h
index 58129e287ff06ab065e8dcbd132638ec9cc93a8c..130fafae6ceeb9c925a0f1d0a36b43468fd3de57 100644 (file)
--- a/cfile.h
+++ b/cfile.h
@@ -1,8 +1,6 @@
 /* cfile.h
  * capture_file definition & GUI-independent manipulation
  *
- * $Id$
- *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
@@ -25,9 +23,12 @@
 #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 "frame_data_sequence.h"
+#include <epan/frame_data_sequence.h>
+#include <wiretap/wtap.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -35,7 +36,7 @@ extern "C" {
 
 /* Current state of file. */
 typedef enum {
-  FILE_CLOSED,                 /* No file open */
+  FILE_CLOSED,                  /* No file open */
   FILE_READ_IN_PROGRESS,        /* Reading a file we've opened */
   FILE_READ_ABORTED,            /* Read aborted by user */
   FILE_READ_DONE                /* Read completed */
@@ -54,20 +55,16 @@ typedef enum {
   SD_BACKWARD
 } search_direction;
 
-/*
- * We store the frame_data structures in a radix tree, with 1024
- * elements per level.  The leaf nodes are arrays of 1024 frame_data
- * structures; the nodes above them are arrays of 1024 pointers to
- * the nodes below them.  The capture_file structure has a pointer
- * to the root node.
- *
- * As frame numbers are 32 bits, and as 1024 is 2^10, that gives us
- * up to 4 levels of tree.
- */
-#define LOG2_NODES_PER_LEVEL   10
-#define NODES_PER_LEVEL                (1<<LOG2_NODES_PER_LEVEL)
+#ifdef WANT_PACKET_EDITOR
+/* XXX, where this struct should go? */
+typedef struct {
+  struct wtap_pkthdr phdr; /**< Modified packet header */
+  char *pd;                /**< Modified packet data */
+} modified_frame_data;
+#endif
 
 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" */
@@ -75,6 +72,7 @@ typedef struct _capture_file {
   gboolean     unsaved_changes; /* Does the capture file have changes that have not been saved? */
   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 */
@@ -108,7 +106,7 @@ typedef struct _capture_file {
   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 */
-  guint8       pd[WTAP_MAX_PACKET_SIZE];  /* Packet data */
+  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 */
@@ -118,17 +116,39 @@ typedef struct _capture_file {
   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 */
+  field_info  *finfo_selected;  /* Field info for currently selected field */
 #ifdef WANT_PACKET_EDITOR
   GTree       *edited_frames;   /* BST with modified frames */
 #endif
-  gpointer     window;         /* Top-level window associated with file */
+  gpointer     window;          /* Top-level window associated with file */
+  GTree       *frames_user_comments;   /* BST with user comments for frames (key = frame_data) */
+  gulong       computed_elapsed;
+
+  guint32      cum_bytes;
+  const frame_data *ref;
+  frame_data  *prev_dis;
+  frame_data  *prev_cap;
 } capture_file;
 
 extern void cap_file_init(capture_file *cf);
 
+extern const char *cap_file_get_interface_name(void *data, guint32 interface_id);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
 #endif /* cfile.h */
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local Variables:
+ * c-basic-offset: 2
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=2 tabstop=8 expandtab:
+ * :indentSize=2:tabSize=8:noTabs=true:
+ */