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/packetlogger.c | |
| parent | 6287efb9c05482531ea675bb5a3d23b03b5715ab (diff) | |
| download | wireshark-c0c480d08c175eed4524ea9e73ec86298f468cf4.tar.gz | |
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/packetlogger.c')
| -rw-r--r-- | wiretap/packetlogger.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/wiretap/packetlogger.c b/wiretap/packetlogger.c index 313cf3e5b8..5970b00d20 100644 --- a/wiretap/packetlogger.c +++ b/wiretap/packetlogger.c @@ -44,11 +44,11 @@ typedef struct packetlogger_header { guint64 ts; } packetlogger_header_t; -static gboolean packetlogger_read(wtap *wth, int *err, gchar **err_info, - gint64 *data_offset); -static gboolean packetlogger_seek_read(wtap *wth, gint64 seek_off, - struct wtap_pkthdr *phdr, - Buffer *buf, int *err, gchar **err_info); +static int packetlogger_read(wtap *wth, int *err, gchar **err_info, + gint64 *data_offset); +static int packetlogger_seek_read(wtap *wth, gint64 seek_off, + struct wtap_pkthdr *phdr, + Buffer *buf, int *err, gchar **err_info); static gboolean packetlogger_read_header(packetlogger_header_t *pl_hdr, FILE_T fh, int *err, gchar **err_info); static gboolean packetlogger_read_packet(FILE_T fh, struct wtap_pkthdr *phdr, @@ -93,29 +93,31 @@ int packetlogger_open(wtap *wth, int *err, gchar **err_info) return 1; /* Our kind of file */ } -static gboolean +static int packetlogger_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) { *data_offset = file_tell(wth->fh); - return packetlogger_read_packet(wth->fh, &wth->phdr, - wth->frame_buffer, err, err_info); + if (!packetlogger_read_packet(wth->fh, &wth->phdr, + wth->frame_buffer, err, err_info)) + return -1; + return REC_TYPE_PACKET; } -static gboolean +static int packetlogger_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, SEEK_SET, err) == -1) - return FALSE; + return -1; if(!packetlogger_read_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; } static gboolean |