Apply #616 fix to flows.c, fix #665 #666
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
dumprop
commented
May 9, 2021
| @@ -109,9 +109,6 @@ get_l2protocol(const u_char *pktdata, const uint32_t datalen, const int datalink | |||
| } | |||
|
|
|||
| if ((pktdata[3] & JUNIPER_FLAG_EXT) == JUNIPER_FLAG_EXT) { | |||
| if (datalen < 6) | |||
There was a problem hiding this comment.
I removed that validation because there datalen < 4 already
Line 102 in c785b21
Comment on lines
+26
to
+29
| #define JUNIPER_FLAG_NO_L2 0x02 /* L2 header */ | ||
| #define JUNIPER_FLAG_EXT 0x80 /* Juniper extensions present */ | ||
| #define JUNIPER_PCAP_MAGIC "MGC" | ||
|
|
There was a problem hiding this comment.
Removed magic numbers, as already implemented in get.c
|
Thanks for the PR. Good find. Will add to 4.3.5 release. |
|
Thanks for the PR |
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.
Ported #637 fix for #665