diff options
| author | Henning Surmeier <me@hensur.de> | 2022-01-21 13:27:18 +0100 |
|---|---|---|
| committer | Henning Surmeier <me@hensur.de> | 2022-02-14 21:56:21 +0100 |
| commit | ed7c674da17519e6331a9cef8522c5e49251d505 (patch) | |
| tree | 8c31fe6bd29ac7422d7406d3e4d75242b0638404 /src/conf_mode | |
| parent | e11a7ff1b2817cc8f4b595171fe82a43a209ebc2 (diff) | |
| download | vyos-1x-ed7c674da17519e6331a9cef8522c5e49251d505.tar.gz vyos-1x-ed7c674da17519e6331a9cef8522c5e49251d505.zip | |
backport: policy: T4151: Bugfix policy ipv6-local-route
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/policy-local-route.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/conf_mode/policy-local-route.py b/src/conf_mode/policy-local-route.py index 97ee6a785..1fcd3db2e 100755 --- a/src/conf_mode/policy-local-route.py +++ b/src/conf_mode/policy-local-route.py @@ -121,11 +121,14 @@ def apply(pbr): if rule_rm in pbr: v6 = " -6" if rule_rm == 'rule6_remove' else "" for rule, rule_config in pbr[rule_rm].items(): - for src in (rule_config['source'] or ['']): + rule_config['source'] = rule_config['source'] if 'source' in rule_config else [''] + for src in rule_config['source']: f_src = '' if src == '' else f' from {src} ' - for dst in (rule_config['destination'] or ['']): + rule_config['destination'] = rule_config['destination'] if 'destination' in rule_config else [''] + for dst in rule_config['destination']: f_dst = '' if dst == '' else f' to {dst} ' - for fwmk in (rule_config['fwmark'] or ['']): + rule_config['fwmark'] = rule_config['fwmark'] if 'fwmark' in rule_config else [''] + for fwmk in rule_config['fwmark']: f_fwmk = '' if fwmk == '' else f' fwmark {fwmk} ' call(f'ip{v6} rule del prio {rule} {f_src}{f_dst}{f_fwmk}') @@ -141,9 +144,11 @@ def apply(pbr): for rule, rule_config in pbr_route['rule'].items(): table = rule_config['set']['table'] - for src in (rule_config['source'] or ['all']): + rule_config['source'] = rule_config['source'] if 'source' in rule_config else ['all'] + for src in rule_config['source'] or ['all']: f_src = '' if src == '' else f' from {src} ' - for dst in (rule_config['destination'] or ['all']): + rule_config['destination'] = rule_config['destination'] if 'destination' in rule_config else ['all'] + for dst in rule_config['destination']: f_dst = '' if dst == '' else f' to {dst} ' f_fwmk = '' if 'fwmark' in rule_config: |