diff options
| author | Benjamin M. Hughes <bmhughes@bmhughes.co.uk> | 2020-01-07 14:47:06 +0000 |
|---|---|---|
| committer | Benjamin M. Hughes <bmhughes@bmhughes.co.uk> | 2020-01-09 21:53:20 +0000 |
| commit | 17dd50751d72079ff67c67b3b4143ec234793955 (patch) | |
| tree | 348b89351bcef82aec6df0ad0eccab404f5a487c /src | |
| parent | c05063bc831047a0afebaca74508479ee4af278c (diff) | |
| download | vyos-1x-17dd50751d72079ff67c67b3b4143ec234793955.tar.gz vyos-1x-17dd50751d72079ff67c67b3b4143ec234793955.zip | |
bfd: T1949: fix verification logic for IPv6 BFD peers
IPv6 BFD peers only require a source address unless link-local addresses are used.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/conf_mode/protocols_bfd.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/conf_mode/protocols_bfd.py b/src/conf_mode/protocols_bfd.py index 9ca194edd..58f5b5a0e 100755 --- a/src/conf_mode/protocols_bfd.py +++ b/src/conf_mode/protocols_bfd.py @@ -163,10 +163,15 @@ def verify(bfd): conf = Config() for peer in bfd['new_peers']: - # IPv6 peers require an explicit local address/interface combination - if vyos.validate.is_ipv6(peer['remote']): + # IPv6 link local peers require an explicit local address/interface + if vyos.validate.is_ipv6_link_local(peer['remote']): if not (peer['src_if'] and peer['src_addr']): - raise ConfigError('BFD IPv6 peers require explicit local address and interface setting') + raise ConfigError('BFD IPv6 link-local peers require explicit local address and interface setting') + + # IPv6 peers require an explicit local address + if vyos.validate.is_ipv6(peer['remote']): + if not peer['src_addr']: + raise ConfigError('BFD IPv6 peers require explicit local address setting') # multihop require source address if peer['multihop'] and not peer['src_addr']: |