Fix Missing -z proto,colinfo,ip,gtp.teid_cp and -z proto,colinfo,ip,gtp.teid_data

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

diff --git a/epan/frame_data.h b/epan/frame_data.h
index db6d5034a45d3463cf28103dc96660a3f9e39d88..52f9ef798c9bc0c4a48fa8e0a8e2a376b414a5a8 100644 (file)
--- a/epan/frame_data.h
+++ b/epan/frame_data.h
@@ -3,8 +3,8 @@
  *
  * $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
@@ -29,21 +29,13 @@
 #include "tvbuff.h"
 #include <epan/nstime.h>
 
-#if 0
-/* Defined in color.h */
-#ifndef __COLOR_H__
-typedef struct _color_t /* {
-       guint32 pixel;
-       guint16 red;
-       guint16 green;
-       guint16 blue;
-} */ color_t;
-#endif
-#endif
 
 /* 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 */
@@ -54,8 +46,9 @@ typedef struct _frame_data {
   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_ts;      /* Delta timestamp (yes, it can be negative) */
-  long         file_off;    /* File offset */
+  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 */
@@ -78,8 +71,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);
-extern void p_rem_proto_data(frame_data *fd, int proto);
+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__ */