diff options
| author | Daniil Baturin <daniil@vyos.io> | 2023-10-24 19:53:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-24 19:53:24 +0100 |
| commit | cb912e98de3b17611fc5259bf755ce9eafa7ec18 (patch) | |
| tree | ed39ace611c6358fea8d5d81a63c3d4a778860f9 /python/vyos/firewall.py | |
| parent | b15dbec9b5df507ee31f8e029c5a1c58762a6e43 (diff) | |
| parent | a9e93ef54bd38fd86268ce9e1c581a3852692280 (diff) | |
| download | vyos-1x-cb912e98de3b17611fc5259bf755ce9eafa7ec18.tar.gz vyos-1x-cb912e98de3b17611fc5259bf755ce9eafa7ec18.zip | |
Merge pull request #2399 from nicolas-fort/T5637-sagitta
T5637: Firewall: add new rule at the end of base chains for default-a…
Diffstat (limited to 'python/vyos/firewall.py')
| -rw-r--r-- | python/vyos/firewall.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/python/vyos/firewall.py b/python/vyos/firewall.py index 7de268a00..59e02a2f1 100644 --- a/python/vyos/firewall.py +++ b/python/vyos/firewall.py @@ -87,7 +87,13 @@ def nft_action(vyos_action): def parse_rule(rule_conf, hook, fw_name, rule_id, ip_name): output = [] - def_suffix = '6' if ip_name == 'ip6' else '' + #def_suffix = '6' if ip_name == 'ip6' else '' + if ip_name == 'ip6': + def_suffix = '6' + family = 'ipv6' + else: + def_suffix = '' + family = 'bri' if ip_name == 'bri' else 'ipv4' if 'state' in rule_conf and rule_conf['state']: states = ",".join([s for s, v in rule_conf['state'].items() if v == 'enable']) @@ -258,7 +264,8 @@ def parse_rule(rule_conf, hook, fw_name, rule_id, ip_name): if 'log' in rule_conf and rule_conf['log'] == 'enable': action = rule_conf['action'] if 'action' in rule_conf else 'accept' - output.append(f'log prefix "[{fw_name[:19]}-{rule_id}-{action[:1].upper()}]"') + #output.append(f'log prefix "[{fw_name[:19]}-{rule_id}-{action[:1].upper()}]"') + output.append(f'log prefix "[{family}-{hook}-{fw_name}-{rule_id}-{action[:1].upper()}]"') if 'log_options' in rule_conf: |