diff options
author | Daniel Borkmann <dborkman@redhat.com> | 2013-07-03 17:41:04 +0200 |
---|---|---|
committer | Daniel Borkmann <dborkman@redhat.com> | 2013-07-03 17:41:04 +0200 |
commit | eaa0a2777dc29e5f701efbc037b303b52f3e08be (patch) | |
tree | 7edaa21a58c0ae9aac7524c4b6210ffe97a73920 /pcap_io.h | |
parent | c2dd1b3f2f459b90ed16600bcd5aa0369610e80e (diff) |
pcap: invoke dev->type to pcap linktype mapper
Invoke dev->type to pcap linktype mapper in order to write a correct
pcap file header for various link types. Also fix two bugs in pcap
file header parsing and print a warning with the magic link number in
case of an unknown link type.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'pcap_io.h')
-rw-r--r-- | pcap_io.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -663,17 +663,17 @@ static inline void pcap_validate_header(const struct pcap_filehdr *hdr) pcap_check_magic(hdr->magic); if (hdr->linktype < LINKTYPE_MAX) { - if (!pcap_supported_linktypes[hdr->linktype]) + if (pcap_supported_linktypes[hdr->linktype]) good = true; } if (linktype_swab < LINKTYPE_MAX) { - if (!pcap_supported_linktypes[linktype_swab]) + if (pcap_supported_linktypes[linktype_swab]) good = true; } if (!good) - panic("This file has an unsupported pcap header!\n"); + panic("This file has an unsupported pcap link type (%d)!\n", hdr->linktype); if (unlikely(hdr->version_major != PCAP_VERSION_MAJOR) && ___constant_swab16(hdr->version_major) != PCAP_VERSION_MAJOR) panic("This file has not a valid pcap header\n"); |