diff options
| author | Florian Westphal <fw@strlen.de> | 2026-02-12 18:03:54 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2026-02-13 12:32:05 +0100 |
| commit | bf77b769b83a68c841dcb4f7cdf3998e2817727f (patch) | |
| tree | 58fed0e34da3660115a49709b6e090b9947a8567 /iptables-test.py | |
| parent | 758cfe51968a1fbd78cc7a6041c467e64f090d3a (diff) | |
nft: revert compat expressions in userdata
This reverts the following commits:
758cfe51968a ("configure: Auto-detect libz unless explicitly requested")
fdb541cddad0 ("tests: iptables-test: Add nft-compat variant")
7746fa0b1619 ("nft: Embed compat extensions in rule userdata")
ff5f6a208efc ("nft-ruleparse: Fallback to compat expressions in userdata")
f6f0f4f55794 ("nft: Introduce UDATA_TYPE_COMPAT_EXT")
The main intended user for '--compat' will likely go away. It is also
unlikely the 'iptables-only-emits-native-nft' will ever come to pass.
If there is ever a demand of iptables-to-native-nft that can list rules
even if decompilation step fails then we can always resurrect this again
if needed be.
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'iptables-test.py')
| -rwxr-xr-x | iptables-test.py | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/iptables-test.py b/iptables-test.py index be47a653..66db5521 100755 --- a/iptables-test.py +++ b/iptables-test.py @@ -613,8 +613,6 @@ def main(): help='Check for missing tests') parser.add_argument('-n', '--nftables', action='store_true', help='Test iptables-over-nftables') - parser.add_argument('--compat', action='store_true', - help='Test iptables-over-nftables in forced compat mode') parser.add_argument('-N', '--netns', action='store_const', const='____iptables-container-test', help='Test netnamespace path') @@ -634,10 +632,8 @@ def main(): variants.append("legacy") if args.nftables: variants.append("nft") - if args.compat: - variants.append("nft-compat") if len(variants) == 0: - variants = [ "legacy", "nft", "nft-compat" ] + variants = [ "legacy", "nft" ] if os.getuid() != 0: print("You need to be root to run this, sorry", file=sys.stderr) @@ -656,14 +652,8 @@ def main(): total_passed = 0 total_tests = 0 for variant in variants: - - exec_infix = variant - if variant == "nft-compat": - os.putenv("XTABLES_COMPAT", "2") - exec_infix = "nft" - global EXECUTABLE - EXECUTABLE = "xtables-" + exec_infix + "-multi" + EXECUTABLE = "xtables-" + variant + "-multi" test_files = 0 tests = 0 |