DRAFT Split fix_program() and fix_offset() into smaller parts. #1522
Conversation
This file contains hidden or 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
The for loop that rewrites the filter program in fix_program() does not need to test handlep->cooked at every iteration because the value stays the same. Also in this context handlep->cooked == 1 means the handle is either DLT_LINUX_SLL or DLT_LINUX_SLL2, and fix_offset() almost entirely is two independent functions multiplexed on these two DLTs, so it is two separate cases disguised as one. To make this code easier to follow, split fix_offset() into one function for DLT_LINUX_SLL and another for DLT_LINUX_SLL2, factor the "cooked" for loop out of fix_program() into a new fix_cooked() function and provide the latter with a pointer to one of the new two instruction fixer functions. Also in fix_cooked() rejig the switch block cases to spell only the valid combinations of BPF instruction class and mode.
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.
Yet another unfinished piece from my working copy. This one looks mostly complete, but I could not quickly verify that the new revision works as expected in every case. Requires a bit more work.