diff options
| author | Guy Harris <guy@alum.mit.edu> | 2010-07-22 09:11:16 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2010-07-22 09:11:16 +0000 |
| commit | a887d3a9f3e6d8f44b0546a4ff2446bd0cced03f (patch) | |
| tree | cf3c8a8053bb95f3dc48654b4f1349e1f5a0c561 /epan/frame_data.h | |
| parent | 210227d8dad44bc4e764b9dfccd36796011ed292 (diff) | |
In the frame_data structure, expand the per-packet
encapsulation/data-link type to 16 bits, and shuffle some fields to
eliminate some unnecessary padding - the net result should be no change
in the structure size for 32 bits and a few bytes removed for 64 bits.
This allows more encapsulation types - we've just about run out of the
ones that fit in a signed 8-bit integer - and thus should fix bug 5025.
svn path=/trunk/; revision=33613
Diffstat (limited to 'epan/frame_data.h')
| -rw-r--r-- | epan/frame_data.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/frame_data.h b/epan/frame_data.h index 1a4f9ff6f0..85161e7d70 100644 --- a/epan/frame_data.h +++ b/epan/frame_data.h @@ -47,9 +47,9 @@ typedef struct _frame_data { guint32 pkt_len; /* Packet length */ guint32 cap_len; /* Amount actually captured */ guint32 cum_bytes; /* Cumulative bytes into the capture */ - guint16 subnum; /* subframe number, for protocols that require this */ gint64 file_off; /* File offset */ - gint8 lnk_t; /* Per-packet encapsulation/data-link type */ + guint16 subnum; /* subframe number, for protocols that require this */ + gint16 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...) */ |