diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-05-18 02:36:00 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-05-18 02:36:00 +0000 |
| commit | 33e1232f23a98b15e1d3e8fc2ca2e36a86f067bb (patch) | |
| tree | f6ce3c6d55f245fcdec5cb4c0315b1df632ec069 /wiretap/pcap-common.h | |
| parent | ba8ead5e61bb8541adf283e0a15e3368f8ef6400 (diff) | |
| download | wireshark-33e1232f23a98b15e1d3e8fc2ca2e36a86f067bb.tar.gz | |
In the pcapng seek-read routine, *don't* fill in wth->phdr; seek-read
routines are passed a separate struct wtap_pkthdr to be filled in.
Get rid of the pseudo_header member of the wblock structure - the
pseudo-header is part of the struct wtap_pkthdr.
Get rid of the union wtap_pseudo_header * argument to
pcap_process_pseudo_header() - it's passed a pointer to a struct
pcap_pkthdr, and that structure contains the union in question.
Have libpcap_read_header() take a FILE_T argument, rather than using
only the "sequential" handle of the wtap it's handed. Have the libpcap
read routine return the offset of the beginning of the pcap record, and
have the seek-read routine read the header and fill in the struct
wtap_pkthdr handed to it.
svn path=/trunk/; revision=49401
Diffstat (limited to 'wiretap/pcap-common.h')
| -rw-r--r-- | wiretap/pcap-common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/pcap-common.h b/wiretap/pcap-common.h index 4f7fb25cf2..734d81856f 100644 --- a/wiretap/pcap-common.h +++ b/wiretap/pcap-common.h @@ -32,8 +32,8 @@ #include "ws_symbol_export.h" extern int pcap_process_pseudo_header(FILE_T fh, int file_type, int wtap_encap, - guint packet_size, gboolean check_packet_size, struct wtap_pkthdr *phdr, - union wtap_pseudo_header *pseudo_header, int *err, gchar **err_info); + guint packet_size, gboolean check_packet_size, + struct wtap_pkthdr *phdr, int *err, gchar **err_info); extern void pcap_read_post_process(int file_type, int wtap_encap, union wtap_pseudo_header *pseudo_header, |