diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-08-20 09:49:32 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-08-20 09:49:32 +0000 |
| commit | 0819c36d3a7effe000ab41d93c5cc2ac18b9fa7b (patch) | |
| tree | 8ad31670f0a3ee478319a45cb0268dfd5183f3d6 /epan/frame_data.h | |
| parent | 7945bf1bc9926fb7eab8cb0f66e2a7c2b0149fbb (diff) | |
| download | wireshark-0819c36d3a7effe000ab41d93c5cc2ac18b9fa7b.tar.gz | |
Prepare to store column text in frame data directly.
svn path=/trunk/; revision=29483
Diffstat (limited to 'epan/frame_data.h')
| -rw-r--r-- | epan/frame_data.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/epan/frame_data.h b/epan/frame_data.h index 126ca53097..90b44f919c 100644 --- a/epan/frame_data.h +++ b/epan/frame_data.h @@ -44,11 +44,6 @@ typedef struct _frame_data { guint32 pkt_len; /* Packet length */ guint32 cap_len; /* Amount actually captured */ 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 */ @@ -58,6 +53,12 @@ typedef struct _frame_data { 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 */ + 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 */ + gchar **col_text; /* The column text for some columns, see colum_utils */ } frame_data; /* |