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/libpcap.c | |
| parent | e4fea1939cd608cc09eff9406a2225a227ea30c3 (diff) | |
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/libpcap.c')
| -rw-r--r-- | wiretap/libpcap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index beee98f4fd..31e8e712fd 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -636,7 +636,7 @@ static gboolean libpcap_read(wtap *wth, int *err, gchar **err_info, *data_offset = wth->data_offset; - phdr_len = pcap_process_pseudo_header(wth, wth->fh, packet_size, + phdr_len = pcap_process_pseudo_header(wth, wth->file_encap, wth->fh, packet_size, TRUE, &wth->phdr, &wth->pseudo_header, err, err_info); if (phdr_len < 0) return FALSE; /* error */ @@ -704,7 +704,7 @@ libpcap_seek_read(wtap *wth, gint64 seek_off, if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1) return FALSE; - phdr_len = pcap_process_pseudo_header(wth, wth->random_fh, length, + phdr_len = pcap_process_pseudo_header(wth, wth->file_encap, wth->random_fh, length, FALSE, NULL, pseudo_header, err, err_info); if (phdr_len < 0) return FALSE; /* error */ |