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/radcom.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/radcom.c')
| -rw-r--r-- | wiretap/radcom.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/wiretap/radcom.c b/wiretap/radcom.c index e056cdd691..16df1397e7 100644 --- a/wiretap/radcom.c +++ b/wiretap/radcom.c @@ -84,9 +84,9 @@ struct radcomrec_hdr { char xxw[9]; /* unknown */ }; -static gboolean radcom_read(wtap *wth, int *err, gchar **err_info, +static int radcom_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset); -static gboolean radcom_seek_read(wtap *wth, gint64 seek_off, +static int radcom_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info); static gboolean radcom_read_rec(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info); @@ -252,8 +252,8 @@ read_error: } /* Read the next packet */ -static gboolean radcom_read(wtap *wth, int *err, gchar **err_info, - gint64 *data_offset) +static int radcom_read(wtap *wth, int *err, gchar **err_info, + gint64 *data_offset) { int bytes_read; char fcs[2]; @@ -264,7 +264,7 @@ static gboolean radcom_read(wtap *wth, int *err, gchar **err_info, if (!radcom_read_rec(wth, wth->fh, &wth->phdr, wth->frame_buffer, err, err_info)) { /* Read error or EOF */ - return FALSE; + return -1; } if (wth->file_encap == WTAP_ENCAP_LAPB) { @@ -278,20 +278,20 @@ static gboolean radcom_read(wtap *wth, int *err, gchar **err_info, *err = file_error(wth->fh, err_info); if (*err == 0) *err = WTAP_ERR_SHORT_READ; - return FALSE; + return -1; } } - return TRUE; + return REC_TYPE_PACKET; } -static gboolean +static int radcom_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; /* Read record. */ if (!radcom_read_rec(wth, wth->random_fh, phdr, buf, err, @@ -301,9 +301,9 @@ radcom_seek_read(wtap *wth, gint64 seek_off, /* EOF means "short read" in random-access mode */ *err = WTAP_ERR_SHORT_READ; } - return FALSE; + return -1; } - return TRUE; + return REC_TYPE_PACKET; } static gboolean |