diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-05-08 22:59:19 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-05-09 03:04:39 +0000 |
| commit | 1abeb277f5e6bd27fbaebfecc8184e37ba9d008a (patch) | |
| tree | 8cc6eaa5a6982454a00adc600fa4aab02bec3d73 /filetap | |
| parent | aa3a968eb6e85c47014a4cec4a2b955357b0e77f (diff) | |
Refactor Wiretap
Start of refactoring Wiretap and breaking structures down into "generally useful fields for dissection" and "capture specific". Since this in intended as a "base" for Wiretap and Filetap, the "wft" prefix is used for "common" functionality.
The "architectural" changes can be found in cfile.h, wtap.h, wtap-int.h and (new file) wftap-int.h. Most of the other (painstaking) changes were really just the result of compiling those new architecture changes.
bug:9607
Change-Id: Ife858a61760d7a8a03be073546c0e7e582cab2ae
Reviewed-on: https://code.wireshark.org/review/1485
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'filetap')
| -rw-r--r-- | filetap/file_access.c | 2 | ||||
| -rw-r--r-- | filetap/ftap.c | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/filetap/file_access.c b/filetap/file_access.c index e82905f840..90bc06bfee 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 wth->fh closing the standard + * a file_close of wfth->fh closing the standard * input of the process. */ fd = ws_dup(0); diff --git a/filetap/ftap.c b/filetap/ftap.c index 0a8c6fa66f..ef35611b84 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 = wth->file_encap; + wth->phdr.pkt_encap = wfth->file_encap; #endif if (!fth->subtype_read(fth, err, err_info, data_offset)) { @@ -460,12 +460,6 @@ wtap_phdr(wtap *wth) { return &wth->phdr; } - -guint8 * -wtap_buf_ptr(wtap *wth) -{ - return buffer_start_ptr(wth->frame_buffer); -} #endif gboolean |