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 /frame_tvbuff.c | |
| parent | a651f3e5edb2f148a0e5f495b5cba0e7fa43e002 (diff) | |
| download | wireshark-a1b1c8bed54b1576e4f0e9e7f583844a12d142bf.tar.gz wireshark-a1b1c8bed54b1576e4f0e9e7f583844a12d142bf.tar.bz2 wireshark-a1b1c8bed54b1576e4f0e9e7f583844a12d142bf.zip | |
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 'frame_tvbuff.c')
| -rw-r--r-- | frame_tvbuff.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/frame_tvbuff.c b/frame_tvbuff.c index 2358af2a7e..b47d206f07 100644 --- a/frame_tvbuff.c +++ b/frame_tvbuff.c @@ -31,14 +31,14 @@ #include "frame_tvbuff.h" #include "globals.h" -#include "wftap-int.h" /* for ->random_fh */ +#include "wtap-int.h" /* for ->random_fh */ struct tvb_frame { struct tvbuff tvb; Buffer *buf; /* Packet data */ - wftap *wth; /**< Wiretap session */ + wtap *wth; /**< Wiretap session */ gint64 file_off; /**< File offset */ guint offset; @@ -51,13 +51,13 @@ frame_read(struct tvb_frame *frame_tvb, struct wtap_pkthdr *phdr, Buffer *buf) gchar *err_info; /* sanity check, capture file was closed? */ - if (cfile.wfth != frame_tvb->wth) + if (cfile.wth != frame_tvb->wth) return FALSE; /* XXX, what if phdr->caplen isn't equal to * frame_tvb->tvb.length + frame_tvb->offset? */ - if (!wftap_seek_read(frame_tvb->wth, frame_tvb->file_off, phdr, buf, &err, &err_info)) { + if (!wtap_seek_read(frame_tvb->wth, frame_tvb->file_off, phdr, buf, &err, &err_info)) { switch (err) { case WTAP_ERR_UNSUPPORTED_ENCAP: case WTAP_ERR_BAD_FILE: @@ -212,12 +212,12 @@ frame_tvbuff_new(const frame_data *fd, const guint8 *buf) frame_tvb = (struct tvb_frame *) tvb; /* XXX, wtap_can_seek() */ - if (cfile.wfth && cfile.wfth->random_fh + if (cfile.wth && cfile.wth->random_fh #ifdef WANT_PACKET_EDITOR && fd->file_off != -1 /* generic clone for modified packets */ #endif ) { - frame_tvb->wth = cfile.wfth; + frame_tvb->wth = cfile.wth; frame_tvb->file_off = fd->file_off; frame_tvb->offset = 0; } else @@ -317,12 +317,12 @@ file_tvbuff_new(const frame_data *fd, const guint8 *buf) frame_tvb = (struct tvb_frame *) tvb; /* XXX, wtap_can_seek() */ - if (cfile.wfth && cfile.wfth->random_fh + if (cfile.wth && cfile.wth->random_fh #ifdef WANT_PACKET_EDITOR && fd->file_off != -1 /* generic clone for modified packets */ #endif ) { - frame_tvb->wth = cfile.wfth; + frame_tvb->wth = cfile.wth; frame_tvb->file_off = fd->file_off; frame_tvb->offset = 0; } else |