Refactor parseNextLayer to include parseUntilLayer and parseUntil #1376
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
…actor/pcap-cpp11-modernization
egecetin
reviewed
Apr 27, 2024
| { | ||
| size_t headerLen = getHeaderLen(); | ||
| if (m_DataLen <= headerLen || headerLen == 0) | ||
| return; | ||
|
|
||
| if (getProtocol() == parseUntil || getOsiModelLayer() == parseUntilLayer) | ||
| return; |
There was a problem hiding this comment.
It will be a pain to change a bit but all return statements in cpp files unfortunately requires a tab indentation
There was a problem hiding this comment.
Got it, somehow didn’t notice that locally, I’ll go through and add them
|
Could you also add tests for these changes? |
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.
This pull request implements the fix to #657 by refactoring the function
parseNextLayer()to include parametersparseUntilandparseUntilLayer, which fixes the issue ofPacket::setRawPacketparsing layers it should not whenparseUntilLayeris set. Like mentioned in the Issue, this solution doesn't break the API and relies on the layers to not parse too far if it's not requested.Main Changes:
parseNextLayer()to check if the next layer should be parsed