diff options
| author | Michael Tüxen <tuexen@fh-muenster.de> | 2009-05-02 17:10:01 +0000 |
|---|---|---|
| committer | Michael Tüxen <tuexen@fh-muenster.de> | 2009-05-02 17:10:01 +0000 |
| commit | accb3a92070d47ecc19b409ee368e58a520b14c7 (patch) | |
| tree | a501744de3b9236734774c1419df7871ef4832d8 /wiretap/pcapng.c | |
| parent | 339d3acd8979967e32f077cf3c6ce3fff0081dba (diff) | |
Fix the handling of non PB/EPB blocks after the initial SDB/IDB.
svn path=/trunk/; revision=28251
Diffstat (limited to 'wiretap/pcapng.c')
| -rw-r--r-- | wiretap/pcapng.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index 9a9edb8f00..3419a97af9 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -1166,7 +1166,9 @@ pcapng_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) wtapng_block_t wblock; + pcapng_debug1("pcapng_read: wth->data_offset is initially %" G_GINT64_MODIFIER "u", wth->data_offset); *data_offset = wth->data_offset; + pcapng_debug1("pcapng_read: *data_offset is initially set to %" G_GINT64_MODIFIER "u", *data_offset); /* XXX - this probably won't work well with unlimited / per packet snapshot length */ buffer_assure_space(wth->frame_buffer, wth->snapshot_length); @@ -1192,6 +1194,8 @@ pcapng_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) /* XXX - improve handling of "unknown" blocks */ pcapng_debug1("pcapng_read: block type 0x%x not PB/EPB", wblock.type); + *data_offset += bytes_read; + pcapng_debug1("pcapng_read: *data_offset is updated to %" G_GINT64_MODIFIER "u", *data_offset); } wth->phdr.caplen = wblock.data.packet.cap_len; @@ -1217,9 +1221,10 @@ pcapng_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) } /*pcapng_debug2("Read length: %u Packet length: %u", bytes_read, wth->phdr.caplen);*/ - wth->data_offset += bytes_read; + wth->data_offset = *data_offset + bytes_read; + pcapng_debug1("pcapng_read: wth->data_offset is finally %" G_GINT64_MODIFIER "u", wth->data_offset); - return TRUE; + return TRUE; } @@ -1239,6 +1244,7 @@ pcapng_seek_read(wtap *wth, gint64 seek_off, if (bytes_read64 <= 0) { return FALSE; /* Seek error */ } + pcapng_debug1("pcapng_seek_read: reading at offset %" G_GINT64_MODIFIER "u", seek_off); wblock.frame_buffer = pd; wblock.pseudo_header = pseudo_header; |