diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-05-23 10:50:02 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-05-23 10:50:10 +0000 |
| commit | a344c9736efe5519543da1290e1ad9065d0b0cff (patch) | |
| tree | 7757d80d74ae710e5d4e4a1b0cb638d0ec644fc4 /wiretap/snoop.c | |
| parent | 716fdc8e398ea7435b23192ab1f7d59e7b21e32b (diff) | |
| download | wireshark-a344c9736efe5519543da1290e1ad9065d0b0cff.tar.gz | |
Revert "Allow wtap_read() and wtap_seek_read() to return non-packet records."
This reverts commit c0c480d08c175eed4524ea9e73ec86298f468cf4.
A better way to do this is to have the record type be part of struct wtap_pkthdr; that keeps the metadata for the record together and requires fewer API changes. That is in-progress.
Change-Id: Ic558f163a48e2c6d0df7f55e81a35a5e24b53bc6
Reviewed-on: https://code.wireshark.org/review/1741
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/snoop.c')
| -rw-r--r-- | wiretap/snoop.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/wiretap/snoop.c b/wiretap/snoop.c index 8001ddf58c..265d23f4a2 100644 --- a/wiretap/snoop.c +++ b/wiretap/snoop.c @@ -84,9 +84,9 @@ struct shomiti_trailer { #define RX_STATUS_FIFO_ERROR 0x0080 /* receive FIFO error */ #define RX_STATUS_TRIGGERED 0x0001 /* frame did trigger */ -static int snoop_read(wtap *wth, int *err, gchar **err_info, +static gboolean snoop_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset); -static int snoop_seek_read(wtap *wth, gint64 seek_off, +static gboolean snoop_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info); static int snoop_read_packet(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info); @@ -447,7 +447,7 @@ typedef struct { /* Read the next packet */ -static int snoop_read(wtap *wth, int *err, gchar **err_info, +static gboolean snoop_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) { int padbytes; @@ -460,7 +460,7 @@ static int snoop_read(wtap *wth, int *err, gchar **err_info, padbytes = snoop_read_packet(wth, wth->fh, &wth->phdr, wth->frame_buffer, err, err_info); if (padbytes == -1) - return -1; + return FALSE; /* * Skip over the padding (don't "fseek()", as the standard @@ -482,27 +482,27 @@ static int snoop_read(wtap *wth, int *err, gchar **err_info, *err = file_error(wth->fh, err_info); if (*err == 0) *err = WTAP_ERR_SHORT_READ; - return -1; + return FALSE; } padbytes -= bytes_read; } - return REC_TYPE_PACKET; + return TRUE; } -static int +static gboolean snoop_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 -1; + return FALSE; if (snoop_read_packet(wth, wth->random_fh, phdr, buf, err, err_info) == -1) { if (*err == 0) *err = WTAP_ERR_SHORT_READ; - return -1; + return FALSE; } - return REC_TYPE_PACKET; + return TRUE; } static int |