fix bug where snaplen = 0 #462
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
A pcap file with snaplen=0 means that there was no capture length restriction and all packets are captured at full size. There was a check inherited from gopacket that raised an error if the captured length was larger than the snaplen, which is a bug for snaplen=0. The fix is to change this check to check alsoo that snaplen isn't zero.
aswan
approved these changes
Mar 25, 2020
pcap/pcapio/read.go
Outdated
| @@ -152,7 +152,7 @@ func (r *PcapReader) Read() ([]byte, BlockType, error) { | |||
| } | |||
| caplen := int(r.byteOrder.Uint32(hdr[8:12])) | |||
| fullLength := int(r.byteOrder.Uint32(hdr[12:16])) | |||
| if caplen > int(r.snaplen) { | |||
| if int(r.snaplen) != 0 && caplen > int(r.snaplen) { | |||
There was a problem hiding this comment.
nit: it doesn't look like you need the int() cast just to check against 0?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A pcap file with snaplen=0 means that there was no capture length
restriction and all packets are captured at full size. There was
a check inherited from gopacket that raised an error if the
captured length was larger than the snaplen, which is a bug for
snaplen=0. The fix is to change this check to check alsoo that
snaplen isn't zero.