diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-05-22 20:01:31 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-05-23 03:02:32 +0000 |
| commit | c0c480d08c175eed4524ea9e73ec86298f468cf4 (patch) | |
| tree | 1234cd09094dcc8447e3fb2b13671f12aba5ae69 /wiretap/toshiba.c | |
| parent | 6287efb9c05482531ea675bb5a3d23b03b5715ab (diff) | |
Allow wtap_read() and wtap_seek_read() to return non-packet records.
This is the first step towards implementing the mechanisms requestd in
bug 8590; currently, we don't return any records other than packet
records from libwiretap, and just ignore non-packet records in the rest
of Wireshark, but this at least gets the ball rolling.
Change-Id: I34a45b54dd361f69fdad1a758d8ca4f42d67d574
Reviewed-on: https://code.wireshark.org/review/1736
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/toshiba.c')
| -rw-r--r-- | wiretap/toshiba.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/wiretap/toshiba.c b/wiretap/toshiba.c index 6fcf40270b..6e8ab1a178 100644 --- a/wiretap/toshiba.c +++ b/wiretap/toshiba.c @@ -105,9 +105,9 @@ static const char toshiba_rec_magic[] = { '[', 'N', 'o', '.' }; */ #define TOSHIBA_MAX_PACKET_LEN 16384 -static gboolean toshiba_read(wtap *wth, int *err, gchar **err_info, +static int toshiba_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset); -static gboolean toshiba_seek_read(wtap *wth, gint64 seek_off, +static int toshiba_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info); static gboolean parse_single_hex_dump_line(char* rec, guint8 *buf, guint byte_offset); @@ -214,7 +214,7 @@ int toshiba_open(wtap *wth, int *err, gchar **err_info) } /* Find the next packet and parse it; called from wtap_read(). */ -static gboolean toshiba_read(wtap *wth, int *err, gchar **err_info, +static int toshiba_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) { gint64 offset; @@ -222,29 +222,31 @@ static gboolean toshiba_read(wtap *wth, int *err, gchar **err_info, /* Find the next packet */ offset = toshiba_seek_next_packet(wth, err, err_info); if (offset < 1) - return FALSE; + return -1; *data_offset = offset; /* Parse the packet */ - return parse_toshiba_packet(wth->fh, &wth->phdr, wth->frame_buffer, - err, err_info); + if (!parse_toshiba_packet(wth->fh, &wth->phdr, wth->frame_buffer, + err, err_info)) + return -1; + return REC_TYPE_PACKET; } /* Used to read packets in random-access fashion */ -static gboolean +static int toshiba_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info) { if (file_seek(wth->random_fh, seek_off - 1, SEEK_SET, err) == -1) - return FALSE; + return -1; if (!parse_toshiba_packet(wth->random_fh, phdr, buf, err, err_info)) { if (*err == 0) *err = WTAP_ERR_SHORT_READ; - return FALSE; + return -1; } - return TRUE; + return REC_TYPE_PACKET; } /* Parses a packet. */ |