New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
pcap-linux: Obtain VLAN TPID from the kernel when available #346
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be as following?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because the tp_vlan_tpid is always defined as the unsigned (__u16) in TPACKET structures, that change is not needed, IMHO. And if the definition is changed to the signed in the future, I think this is a kernel's bug...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry for the noise, I was misreading your points.
The logic for the selecting TPID is same as the TCI, but should it be different logic only in case of the TPID? It seems pcap-linux uses the value when the kernel gives any value if TP_STATUS_*_VALID is defined.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The reason I posted question was that second TP_STATUS_VLAN_TPID_VALID does nothing meaningful when conbined with series of past linux kernels. If a packet has tpid, then first condition will be met, because tpid won't be 0.
Anyway, vlan tag existence will be checked by vlan_tci, and not vlan_tpid. If TP_STATUS_VLAN_TPID_VALID is defined, then we need just check that bit without checking tp_vlan_tpid is 0 or not, IMHO.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, that's right. But then I think the macro just should be as following:
Of course the tp_vlan_tpid will be used in this case even if the TPID is 0, but it ought to be right in the userspace, because the kernel set the TP_STATUS_VLAN_TPID_VALID.