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 /cfile.h | |
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 'cfile.h')
-rw-r--r-- | cfile.h | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -63,11 +63,6 @@ typedef struct { } modified_frame_data; #endif -typedef union _phdr_t { - struct wtap_pkthdr wtap_hdr; - /*** Placeholder for ftap_pkthdr */ -} phdr_t; - typedef struct _capture_file { epan_t *epan; file_state state; /* Current state of capture file */ @@ -92,7 +87,7 @@ typedef struct _capture_file { nstime_t elapsed_time; /* Elapsed time */ gboolean has_snap; /* TRUE if maximum capture packet length is known */ int snap; /* Maximum captured packet length */ - wftap *wfth; /* Tap session */ + wtap *wth; /* Wiretap session */ dfilter_t *rfcode; /* Compiled read filter program */ dfilter_t *dfcode; /* Compiled display filter program */ gchar *dfilter; /* Display filter string */ @@ -109,7 +104,8 @@ typedef struct _capture_file { search_charset_t scs_type; /* Character set for text search */ search_direction dir; /* Direction in which to do searches */ gboolean search_in_progress; /* TRUE if user just clicked OK in the Find dialog or hit <control>N/B */ - phdr_t hdr; /* Packet/File header */ + /* packet data */ + struct wtap_pkthdr phdr; /* Packet header */ Buffer buf; /* Packet data */ /* frames */ frame_data_sequence *frames; /* Sequence of frames, if we're keeping that information */ |