summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-07-22 08:26:11 +0200
committerGitHub <noreply@github.com>2022-07-22 08:26:11 +0200
commit99a0c88dd9dd1c0e0b00a587bbdefb7f04b865e2 (patch)
treea9e0896fc8bb0178f9d44bd75e823cadf31826b1
parentdfd0e56fab14321a55224fc11f4549e781bdf771 (diff)
parent3253864641e797809a99401174688507a01c1255 (diff)
downloadvyos-1x-99a0c88dd9dd1c0e0b00a587bbdefb7f04b865e2.tar.gz
vyos-1x-99a0c88dd9dd1c0e0b00a587bbdefb7f04b865e2.zip
Merge pull request #1421 from vfreex/radvd-prefix-specific-options
T4550: router-advert: Add deprecate-prefix & decrement-lifetimes options
-rw-r--r--data/templates/router-advert/radvd.conf.j22
-rw-r--r--interface-definitions/service-router-advert.xml.in12
2 files changed, 14 insertions, 0 deletions
diff --git a/data/templates/router-advert/radvd.conf.j2 b/data/templates/router-advert/radvd.conf.j2
index ed15b32f0..a464795ad 100644
--- a/data/templates/router-advert/radvd.conf.j2
+++ b/data/templates/router-advert/radvd.conf.j2
@@ -50,6 +50,8 @@ interface {{ iface }} {
AdvValidLifetime {{ prefix_options.valid_lifetime }};
AdvOnLink {{ 'off' if prefix_options.no_on_link_flag is vyos_defined else 'on' }};
AdvPreferredLifetime {{ prefix_options.preferred_lifetime }};
+ DeprecatePrefix {{ 'on' if prefix_options.deprecate_prefix is vyos_defined else 'off' }};
+ DecrementLifetimes {{ 'on' if prefix_options.decrement_lifetime is vyos_defined else 'off' }};
};
{% endfor %}
{% endif %}
diff --git a/interface-definitions/service-router-advert.xml.in b/interface-definitions/service-router-advert.xml.in
index 258b7b749..87ec512d6 100644
--- a/interface-definitions/service-router-advert.xml.in
+++ b/interface-definitions/service-router-advert.xml.in
@@ -249,6 +249,18 @@
<valueless/>
</properties>
</leafNode>
+ <leafNode name="deprecate-prefix">
+ <properties>
+ <help>Upon shutdown, this option will deprecate the prefix by announcing it in the shutdown RA</help>
+ <valueless/>
+ </properties>
+ </leafNode>
+ <leafNode name="decrement-lifetime">
+ <properties>
+ <help>Lifetime is decremented by the number of seconds since the last RA - use in conjunction with a DHCPv6-PD prefix</help>
+ <valueless/>
+ </properties>
+ </leafNode>
<leafNode name="preferred-lifetime">
<properties>
<help>Time in seconds that the prefix will remain preferred</help>