diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-05-09 05:18:49 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-05-09 05:21:01 +0000 |
| commit | a1b1c8bed54b1576e4f0e9e7f583844a12d142bf (patch) | |
| tree | fcadd72c61f9d936451163e83cc1be843073f3b4 /filetap | |
| parent | a651f3e5edb2f148a0e5f495b5cba0e7fa43e002 (diff) | |
Revert "Refactor Wiretap"
This reverts commit 1abeb277f5e6bd27fbaebfecc8184e37ba9d008a.
This isn't building, and looks as if it requires significant work to fix.
Change-Id: I622b1bb243e353e874883a302ab419532b7601f2
Reviewed-on: https://code.wireshark.org/review/1568
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'filetap')
| -rw-r--r-- | filetap/file_access.c | 2 | ||||
| -rw-r--r-- | filetap/ftap.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/filetap/file_access.c b/filetap/file_access.c index 90bc06bfee..e82905f840 100644 --- a/filetap/file_access.c +++ b/filetap/file_access.c @@ -538,7 +538,7 @@ ftap* ftap_open_offline(const char *filename, int *err, char **err_info, if (use_stdin) { /* * We dup FD 0, so that we don't have to worry about - * a file_close of wfth->fh closing the standard + * a file_close of wth->fh closing the standard * input of the process. */ fd = ws_dup(0); diff --git a/filetap/ftap.c b/filetap/ftap.c index ef35611b84..0a8c6fa66f 100644 --- a/filetap/ftap.c +++ b/filetap/ftap.c @@ -378,7 +378,7 @@ ftap_read(ftap *fth, int *err, gchar **err_info, gint64 *data_offset) * *is* FTAP_ENCAP_PER_RECORD, the caller needs to set it * anyway. */ - wth->phdr.pkt_encap = wfth->file_encap; + wth->phdr.pkt_encap = wth->file_encap; #endif if (!fth->subtype_read(fth, err, err_info, data_offset)) { @@ -460,6 +460,12 @@ wtap_phdr(wtap *wth) { return &wth->phdr; } + +guint8 * +wtap_buf_ptr(wtap *wth) +{ + return buffer_start_ptr(wth->frame_buffer); +} #endif gboolean |