diff options
| author | Michael Tüxen <tuexen@fh-muenster.de> | 2009-06-27 11:39:47 +0000 |
|---|---|---|
| committer | Michael Tüxen <tuexen@fh-muenster.de> | 2009-06-27 11:39:47 +0000 |
| commit | 267df8e183e9ed9e56750b4674cc38afd8a7efc3 (patch) | |
| tree | 56251fa022928d24f19cd71dbcdb327e83251ac5 /wiretap/pcap-common.c | |
| parent | e4fea1939cd608cc09eff9406a2225a227ea30c3 (diff) | |
| download | wireshark-267df8e183e9ed9e56750b4674cc38afd8a7efc3.tar.gz wireshark-267df8e183e9ed9e56750b4674cc38afd8a7efc3.tar.bz2 wireshark-267df8e183e9ed9e56750b4674cc38afd8a7efc3.zip | |
This commit
* adds an encap argument to pcap_process_pseudo_header.
* adds support for reading pseudo headers.
It fixes Bug 3560.
Thanks to Tyson Key for reporting the bug and providing
trace files. This fix will be scheduled for inclusion in
Wireshark 1.2.1 and higher.
svn path=/trunk/; revision=28857
Diffstat (limited to 'wiretap/pcap-common.c')
| -rw-r--r-- | wiretap/pcap-common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index e096fc9f36..9184bfd484 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -1115,14 +1115,14 @@ pcap_read_i2c_pseudoheader(FILE_T fh, union wtap_pseudo_header *pseudo_header, i } int -pcap_process_pseudo_header(wtap *wth, FILE_T fh, guint packet_size, +pcap_process_pseudo_header(wtap *wth, int encap, FILE_T fh, guint packet_size, gboolean check_packet_size, struct wtap_pkthdr *phdr, union wtap_pseudo_header *pseudo_header, int *err, gchar **err_info) { int phdr_len = 0; guint size; - switch (wth->file_encap) { + switch (encap) { case WTAP_ENCAP_ATM_PDUS: if (wth->file_type == WTAP_FILE_PCAP_NOKIA) { |