diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-10-16 21:50:57 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-10-16 21:50:57 +0000 |
| commit | 78631020b83c7aab12934f0cff72dbb5e3f0ba4a (patch) | |
| tree | 826f6248fcdb37ec849abebc3bdcc650e0df6c61 /wiretap/dct3trace.c | |
| parent | d7ae273d7a2373ab6fcc1c58d235b4a7dc4df0e9 (diff) | |
Add wtap_pseudo_header union to wtap_pkthdr structure.
Use pkthdr instead of pseudo_header as argument for dissecting.
svn path=/trunk/; revision=45601
Diffstat (limited to 'wiretap/dct3trace.c')
| -rw-r--r-- | wiretap/dct3trace.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/wiretap/dct3trace.c b/wiretap/dct3trace.c index ac58b5785f..9bbae29cfc 100644 --- a/wiretap/dct3trace.c +++ b/wiretap/dct3trace.c @@ -76,7 +76,7 @@ static const char dct3trace_magic_end[] = "</dump>"; static gboolean dct3trace_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset); static gboolean dct3trace_seek_read(wtap *wth, gint64 seek_off, - union wtap_pseudo_header *pseudo_header, guint8 *pd, int len, + struct wtap_pkthdr *phdr, guint8 *pd, int len, int *err, gchar **err_info); /* @@ -347,7 +347,7 @@ static gboolean dct3trace_read(wtap *wth, int *err, gchar **err_info, int buf_len; unsigned char buf[MAX_PACKET_LEN]; - if( !dct3trace_get_packet(wth->fh, &wth->pseudo_header, buf, &buf_len, err, err_info) ) + if( !dct3trace_get_packet(wth->fh, &wth->phdr.pseudo_header, buf, &buf_len, err, err_info) ) { return FALSE; } @@ -371,9 +371,10 @@ static gboolean dct3trace_read(wtap *wth, int *err, gchar **err_info, /* Used to read packets in random-access fashion */ static gboolean dct3trace_seek_read (wtap *wth, gint64 seek_off, - union wtap_pseudo_header *pseudo_header, guint8 *pd, int len, + struct wtap_pkthdr *phdr, guint8 *pd, int len, int *err, gchar **err_info) { + union wtap_pseudo_header *pseudo_header = &phdr->pseudo_header; int buf_len; unsigned char buf[MAX_PACKET_LEN]; |