diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2007-10-08 11:41:21 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2007-10-08 11:41:21 +0000 |
| commit | b9f9b33e0e543eb0c50593e7cc626ecc02de099d (patch) | |
| tree | 9ed41766fa747dd14ab11abddc6df9e6ffff04f0 /wiretap/wtap-int.h | |
| parent | 3862b87c9436a3137d7e5fdc773bf422044b71a3 (diff) | |
From Florent DROUIN:
This is a replacement of the existing decoding of ERF files (Extensible Record
Format from Endace).
For the decoding of the ERF files, according to the "type of record" given in
the ERF header, several decoders can be used. Up to now, the decoder is
determined according to an environment variable, or with a kind of heuristic.
And, all the treatment is done during the file extraction.
The new architecture, will separate the ERF file decoding, and the ERF record
decoding. The ERF records will be decoded with a specific dissector. This
dissector can be configured with options, to replace the environment variable.
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1839
svn path=/trunk/; revision=23092
Diffstat (limited to 'wiretap/wtap-int.h')
| -rw-r--r-- | wiretap/wtap-int.h | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h index 6da8fe4d96..a5afdceb1f 100644 --- a/wiretap/wtap-int.h +++ b/wiretap/wtap-int.h @@ -136,12 +136,6 @@ typedef struct { gboolean has_fcs; } airopeek9_t; -typedef struct { - guint32 atm_encap; - guint32 hdlc_encap; - gboolean is_rawatm; -} erf_t; - typedef struct _k12_t k12_t; typedef struct { @@ -182,7 +176,6 @@ struct wtap { csids_t *csids; etherpeek_t *etherpeek; airopeek9_t *airopeek9; - erf_t *erf; k12_t *k12; catapult_dct2000_t *catapult_dct2000; mpeg_t *mpeg; @@ -409,6 +402,34 @@ extern gint wtap_num_file_types; } #endif +#ifndef phtonll +#define phtonll(p, v) \ + { \ + (p)[0] = (guint8)((v) >> 56); \ + (p)[1] = (guint8)((v) >> 48); \ + (p)[2] = (guint8)((v) >> 40); \ + (p)[3] = (guint8)((v) >> 32); \ + (p)[4] = (guint8)((v) >> 24); \ + (p)[5] = (guint8)((v) >> 16); \ + (p)[6] = (guint8)((v) >> 8); \ + (p)[7] = (guint8)((v) >> 0); \ + } +#endif + +#ifndef pletonll +#define pletonll(p, v) \ + { \ + (p)[0] = (guint8)((v) >> 0); \ + (p)[1] = (guint8)((v) >> 8); \ + (p)[2] = (guint8)((v) >> 16); \ + (p)[3] = (guint8)((v) >> 24); \ + (p)[4] = (guint8)((v) >> 32); \ + (p)[5] = (guint8)((v) >> 40); \ + (p)[6] = (guint8)((v) >> 48); \ + (p)[7] = (guint8)((v) >> 56); \ + } +#endif + #define wtap_file_read_unknown_bytes(target, num_bytes, fh, err) \ G_STMT_START \ { \ |