Repository navigation
pbr-1.2.4: restore nft4 and nft6 for shell user files - #204
Merged
Merged
Conversation
The 1.2.2 shell implementation gave user files nft, nft4 and nft6. The wrapper the ucode version writes around a shell user file only defines nft, so nft4 and nft6 are "not found". The wrapper's exit code is that of the file's last command, so a file that does not end on one of those calls exits 0 and its rules are lost without any error. Define both, keeping the ipv6_enabled gating nft6 had, and which api.nft6() has for ucode user files. Found by the review of openwrt/packages#31156. Two new tests check the wrapper with ipv6_enabled off and on; each passes 1/3 without the fix. Checked on OpenWrt 25.12 with a real shell user file: stock pbr installed only the nft rules and reported no error; with this change the nft4 and nft6 rules are installed, and the nft6 rule is left out with ipv6_enabled off. Assisted-by: Claude:claude-opus-5-5 Signed-off-by: Erik Conijn <egc112@msn.com>
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
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.
The 1.2.2 shell implementation gave user files nft, nft4 and nft6. The wrapper the ucode version writes around a shell user file only defines nft, so nft4 and nft6 are "not found". The wrapper's exit code is that of the file's last command, so a file that does not end on one of those calls exits 0 and its rules are lost without any error.
Define both, keeping the ipv6_enabled gating nft6 had, and which api.nft6() has for ucode user files.
Found by the review of openwrt/packages#31156. Two new tests check the wrapper with ipv6_enabled off and on; each passes 1/3 without the fix. Checked on OpenWrt 25.12 with a real shell user file: stock pbr installed only the nft rules and reported no error; with this change the nft4 and nft6 rules are installed, and the nft6 rule is left out with ipv6_enabled off.
Assisted-by: Claude:claude-opus-5-5