diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-01-19 21:01:52 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-01-22 07:47:17 +0100 |
| commit | 2ec023752bdd400835eb69a8f1f9d2873cef61fa (patch) | |
| tree | 136e81b7fac983ff74601efdd90dfb4255fb35d6 /python/vyos/template.py | |
| parent | 5c6d4b17d90cdfdf1541d81fb081575c54b168a7 (diff) | |
| download | vyos-1x-2ec023752bdd400835eb69a8f1f9d2873cef61fa.tar.gz vyos-1x-2ec023752bdd400835eb69a8f1f9d2873cef61fa.zip | |
firewall: T5729: T5681: T5217: backport subsystem from current branch
This is a combined backport for all accumulated changes done to the firewall
subsystem on the current branch.
Diffstat (limited to 'python/vyos/template.py')
| -rw-r--r-- | python/vyos/template.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/python/vyos/template.py b/python/vyos/template.py index 4b6dca254..d1b3e8fa8 100644 --- a/python/vyos/template.py +++ b/python/vyos/template.py @@ -574,10 +574,10 @@ def nft_rule(rule_conf, fw_hook, fw_name, rule_id, ip_name='ip'): return parse_rule(rule_conf, fw_hook, fw_name, rule_id, ip_name) @register_filter('nft_default_rule') -def nft_default_rule(fw_conf, fw_name, ipv6=False): +def nft_default_rule(fw_conf, fw_name, family): output = ['counter'] default_action = fw_conf['default_action'] - family = 'ipv6' if ipv6 else 'ipv4' + #family = 'ipv6' if ipv6 else 'ipv4' if 'default_log' in fw_conf: action_suffix = default_action[:1].upper() @@ -587,7 +587,7 @@ def nft_default_rule(fw_conf, fw_name, ipv6=False): output.append(f'{default_action}') if 'default_jump_target' in fw_conf: target = fw_conf['default_jump_target'] - def_suffix = '6' if ipv6 else '' + def_suffix = '6' if family == 'ipv6' else '' output.append(f'NAME{def_suffix}_{target}') output.append(f'comment "{fw_name} default-action {default_action}"') |