fix: wrong ipset name used by ip6tables. #1654
Merged
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
ipset name has prefix "inet6:" for ipv6. so ip6tables rule also need to convert ipset name. Signed-off-by: xujunjie-cover <xujunjie37@jd.com>
xujunjie-cover
force-pushed
the
fix-np-ipv6
branch
from
c48fa87 to
8655bff
Compare
Naming ipsets with the advent of IPv6 gets tricky because IPv6 ipsets have to be prefixed with inet6:. This commit adds additional utilities that help users find the correct name of ipsets.
Use ipSetName utility method to ensure that ipset names are generated correctly when they are formulated. This feeds into the activeIPSets map later on, so it is important that we get the name right from the start.
|
@xujunjie-cover Thanks for digging into this and being willing to contribute a fix. When I tested it in my environment, I found that there was still a small problem where it was trying to delete the valid inet6 prefixed ipsets on cleanup. It looks like this is because the ipset needed to be prefixed correctly when it was generated. I also added some unit tests to this to hopefully prevent regression. |
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.
ipset name has prefix "inet6:" for ipv6. so ip6tables rule also need to convert ipset name.
Issue: #1653