summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorinitramfs <initramfs@initramfs.io>2022-07-31 09:35:00 +0800
committerinitramfs <initramfs@initramfs.io>2022-08-01 06:23:15 +0800
commit0564f830a77995de4d074ae948a5f1d1d3503f90 (patch)
treef6f0c21fc5a0d249ab42d8d543467b39921c8c9a /src
parent4168e03721b2a9595de4090fddf1280d39ccce4c (diff)
downloadvyos-1x-0564f830a77995de4d074ae948a5f1d1d3503f90.tar.gz
vyos-1x-0564f830a77995de4d074ae948a5f1d1d3503f90.zip
router-advert: T4582: fix preferred cannot equal valid lifetime
Allows preferred lifetime for prefix advertisements to equal the configured valid lifetime as per RFC 4861. (cherry picked from commit f6efe3035d352970dc492450c3c9ddf710dda5fe)
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/service_router-advert.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/conf_mode/service_router-advert.py b/src/conf_mode/service_router-advert.py
index 9afcdd63e..367567bf6 100755
--- a/src/conf_mode/service_router-advert.py
+++ b/src/conf_mode/service_router-advert.py
@@ -92,8 +92,8 @@ def verify(rtradv):
if preferred_lifetime == 'infinity':
preferred_lifetime = 4294967295
- if not (int(valid_lifetime) > int(preferred_lifetime)):
- raise ConfigError('Prefix valid-lifetime must be greater then preferred-lifetime')
+ if not (int(valid_lifetime) >= int(preferred_lifetime)):
+ raise ConfigError('Prefix valid-lifetime must be greater then or equal to preferred-lifetime')
return None