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/iptrace.c | |
| parent | 716fdc8e398ea7435b23192ab1f7d59e7b21e32b (diff) | |
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/iptrace.c')
| -rw-r--r-- | wiretap/iptrace.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/wiretap/iptrace.c b/wiretap/iptrace.c index 3f128fe205..67e8e65806 100644 --- a/wiretap/iptrace.c +++ b/wiretap/iptrace.c @@ -214,7 +214,7 @@ iptrace_read_rec_1_0(FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, } /* Read the next packet */ -static int iptrace_read_1_0(wtap *wth, int *err, gchar **err_info, +static gboolean iptrace_read_1_0(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) { *data_offset = file_tell(wth->fh); @@ -223,7 +223,7 @@ static int iptrace_read_1_0(wtap *wth, int *err, gchar **err_info, if (!iptrace_read_rec_1_0(wth->fh, &wth->phdr, wth->frame_buffer, err, err_info)) { /* Read error or EOF */ - return -1; + return FALSE; } /* If the per-file encapsulation isn't known, set it to this @@ -239,22 +239,22 @@ static int iptrace_read_1_0(wtap *wth, int *err, gchar **err_info, wth->file_encap = WTAP_ENCAP_PER_PACKET; } - return REC_TYPE_PACKET; + return TRUE; } -static int iptrace_seek_read_1_0(wtap *wth, gint64 seek_off, +static gboolean iptrace_seek_read_1_0(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; /* Read the packet */ if (!iptrace_read_rec_1_0(wth->random_fh, phdr, buf, err, err_info)) { if (*err == 0) *err = WTAP_ERR_SHORT_READ; - return -1; + return FALSE; } - return REC_TYPE_PACKET; + return TRUE; } /*********************************************************** @@ -409,7 +409,7 @@ iptrace_read_rec_2_0(FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, } /* Read the next packet */ -static int iptrace_read_2_0(wtap *wth, int *err, gchar **err_info, +static gboolean iptrace_read_2_0(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) { *data_offset = file_tell(wth->fh); @@ -418,7 +418,7 @@ static int iptrace_read_2_0(wtap *wth, int *err, gchar **err_info, if (!iptrace_read_rec_2_0(wth->fh, &wth->phdr, wth->frame_buffer, err, err_info)) { /* Read error or EOF */ - return -1; + return FALSE; } /* If the per-file encapsulation isn't known, set it to this @@ -434,22 +434,22 @@ static int iptrace_read_2_0(wtap *wth, int *err, gchar **err_info, wth->file_encap = WTAP_ENCAP_PER_PACKET; } - return REC_TYPE_PACKET; + return TRUE; } -static int iptrace_seek_read_2_0(wtap *wth, gint64 seek_off, +static gboolean iptrace_seek_read_2_0(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; /* Read the packet */ if (!iptrace_read_rec_2_0(wth->random_fh, phdr, buf, err, err_info)) { if (*err == 0) *err = WTAP_ERR_SHORT_READ; - return -1; + return FALSE; } - return REC_TYPE_PACKET; + return TRUE; } static int |