diff options
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 |