diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-09-26 12:57:05 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-09-26 19:58:27 +0000 |
| commit | ad335a52d8af46dda02f9ccd66412a645a06bc00 (patch) | |
| tree | 7a3702598ab98444feddf25dd5334dede92a4ddd /wiretap/pcapng.c | |
| parent | c7f4badb8caf4ea42a0d2b064433ba902ab1e77d (diff) | |
Get rid of unnecessary check.
Either pcap_process_pseudo_header() returns -1, in which case we fail,
or it returns the exact same value as pcap_get_phdr_size(). If we don't
fail, don't bother to check whether the values are the same.
Change-Id: I18191cc3de2a1c2144ca9b508ed17b2f593fc835
Reviewed-on: https://code.wireshark.org/review/29879
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/pcapng.c')
| -rw-r--r-- | wiretap/pcapng.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index 428c4a8708..fa84530e68 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -1231,10 +1231,6 @@ pcapng_read_packet_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn, wta return FALSE; } block_read += pseudo_header_len; - if (pseudo_header_len != pcap_get_phdr_size(iface_info.wtap_encap, &wblock->rec->rec_header.packet_header.pseudo_header)) { - pcapng_debug("pcapng_read_packet_block: Could only read %d bytes for pseudo header.", - pseudo_header_len); - } wblock->rec->rec_header.packet_header.caplen = packet.cap_len - pseudo_header_len; wblock->rec->rec_header.packet_header.len = packet.packet_len - pseudo_header_len; @@ -1518,10 +1514,6 @@ pcapng_read_simple_packet_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t * } wblock->rec->rec_header.packet_header.caplen = simple_packet.cap_len - pseudo_header_len; wblock->rec->rec_header.packet_header.len = simple_packet.packet_len - pseudo_header_len; - if (pseudo_header_len != pcap_get_phdr_size(iface_info.wtap_encap, &wblock->rec->rec_header.packet_header.pseudo_header)) { - pcapng_debug("pcapng_read_simple_packet_block: Could only read %d bytes for pseudo header.", - pseudo_header_len); - } memset((void *)&wblock->rec->rec_header.packet_header.pseudo_header, 0, sizeof(union wtap_pseudo_header)); |