diff options
| author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-21 17:12:46 +0000 |
|---|---|---|
| committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-21 17:12:46 +0000 |
| commit | acf06b0ec64df38b5791bcb0ceeaf8d1d21bea16 (patch) | |
| tree | ca1af24fcdbdb9806cbf5ab0cea88acbf1cb1dfa /epan/frame_data.h | |
| parent | 2b8b69caac7b67da1e3b7af4309ea405bb942f62 (diff) | |
Guard fdata->col_text_len/fdata->col_text with NEW_PACKET_LIST
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30044 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/frame_data.h')
| -rw-r--r-- | epan/frame_data.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/epan/frame_data.h b/epan/frame_data.h index 2e13d7e38b..f59a503cc0 100644 --- a/epan/frame_data.h +++ b/epan/frame_data.h @@ -25,14 +25,14 @@ #ifndef __FRAME_DATA_H__ #define __FRAME_DATA_H__ -#include "column_info.h" -#include "tvbuff.h" +#include <epan/column_info.h> +#include <epan/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". */ @@ -47,11 +47,11 @@ typedef struct _frame_data { gint64 file_off; /* File offset */ gint8 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 */ + 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 */ @@ -61,8 +61,10 @@ typedef struct _frame_data { 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) */ +#ifdef NEW_PACKET_LIST gchar **col_text; /* The column text for some columns, see colum_utils */ guint *col_text_len; /* The length of the column text strings in 'col_text' */ +#endif } frame_data; /* |