Partial fix for bug 2153

[obnox/wireshark/wip.git] / epan / frame_data.h

diff --git a/epan/frame_data.h b/epan/frame_data.h
index 99e07456101fd7e43524816d065f9f2ecd43e514..f8332803e96c8f4799641755a47a63ebe2ef052a 100644 (file)
--- a/epan/frame_data.h
+++ b/epan/frame_data.h
@@ -1,22 +1,22 @@
 /* frame_data.h
  * Definitions for frame_data structures and routines
  *
- * $Id: frame_data.h,v 1.6 2002/08/14 19:18:15 guy Exp $
+ * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -27,10 +27,15 @@
 
 #include "column_info.h"
 #include "tvbuff.h"
+#include <epan/nstime.h>
+
 
 /* XXX - some of this stuff is used only while a packet is being dissected;
    should we keep that stuff in the "packet_info" structure, instead, to
    save memory? */
+/* The frame number is the ordinal number of the frame in the capture, so
+   it's 1-origin.  In various contexts, 0 as a frame number means "frame
+   number unknown". */
 typedef struct _frame_data {
   struct _frame_data *next; /* Next element in list */
   struct _frame_data *prev; /* Previous element in list */
@@ -38,20 +43,22 @@ typedef struct _frame_data {
   guint32      num;         /* Frame number */
   guint32      pkt_len;     /* Packet length */
   guint32      cap_len;     /* Amount actually captured */
-  gint32       rel_secs;    /* Relative seconds (yes, it can be negative) */
-  gint32       rel_usecs;   /* Relative microseconds (yes, it can be negative) */
-  guint32      abs_secs;    /* Absolute seconds */
-  guint32      abs_usecs;   /* Absolute microseconds */
-  gint32       del_secs;    /* Delta seconds (yes, it can be negative) */
-  gint32       del_usecs;   /* Delta microseconds (yes, it can be negative) */
-  long         file_off;    /* File offset */
+  guint32      cum_bytes;   /* Cumulative bytes into the capture */
+  nstime_t     abs_ts;      /* Absolute timestamp */
+  nstime_t     rel_ts;      /* Relative timestamp (yes, it can be negative) */
+  nstime_t     del_dis_ts;  /* Delta timestamp to previous displayed frame (yes, it can be negative) */
+  nstime_t     del_cap_ts;  /* Delta timestamp to previous captured frame (yes, it can be negative) */
+  gint64       file_off;    /* File offset */
   int          lnk_t;       /* Per-packet encapsulation/data-link type */
   struct {
        unsigned int passed_dfilter     : 1; /* 1 = display, 0 = no display */
        unsigned int encoding           : 2; /* Character encoding (ASCII, EBCDIC...) */
        unsigned int visited            : 1; /* Has this packet been visited yet? 1=Yes,0=No*/
        unsigned int marked             : 1; /* 1 = marked by user, 0 = normal */
+       unsigned int ref_time           : 1; /* 1 = marked as a reference time frame, 0 = normal */
   } flags;
+  void *color_filter;       /* Per-packet matching color_filter_t object */
+  col_expr_t   col_expr;   /* Column expressions & values */
 } frame_data;
 
 /*
@@ -65,13 +72,8 @@ typedef struct {
 
 /* Utility routines used by packet*.c */
 
-extern void p_add_proto_data(frame_data *, int, void *);
-extern void *p_get_proto_data(frame_data *, int);
-
-/* An init routine to be called by epan_init */
-extern void frame_data_init(void);
-
-/* A cleanup routine to be called by epan_cleanup */
-extern void frame_data_cleanup(void);
+extern void p_add_proto_data(frame_data *fd, int proto, void *proto_data);
+extern void *p_get_proto_data(frame_data *fd, int proto);
+extern void p_remove_proto_data(frame_data *fd, int proto);
 
 #endif  /* __FRAME_DATA__ */