summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-08-23 00:16:45 +0200
committerChristian Poessinger <christian@poessinger.com>2020-08-23 01:10:46 +0200
commita574a01ab5c02aeb90c6d099dce482c1bf8be096 (patch)
tree35965564b3162732545b43ab25e4d2ae55e40743
parentec1cf7dd1508e4a84d99818c7e34d093242b3331 (diff)
downloadvyos-1x-a574a01ab5c02aeb90c6d099dce482c1bf8be096.tar.gz
vyos-1x-a574a01ab5c02aeb90c6d099dce482c1bf8be096.zip
dhcpv6-pd: T2677: add support for rapid-commit option
When rapid-commit is specified, dhcp6c will include a rapid-commit option in solicit messages and wait for an immediate reply instead of advertisements.
-rw-r--r--data/templates/dhcp-client/ipv6.tmpl3
-rw-r--r--interface-definitions/include/dhcpv6-options.xml.i8
2 files changed, 10 insertions, 1 deletions
diff --git a/data/templates/dhcp-client/ipv6.tmpl b/data/templates/dhcp-client/ipv6.tmpl
index 85841fe94..68f668117 100644
--- a/data/templates/dhcp-client/ipv6.tmpl
+++ b/data/templates/dhcp-client/ipv6.tmpl
@@ -11,6 +11,9 @@ interface {{ ifname }} {
{% if dhcpv6_options is not defined or dhcpv6_options.temporary is not defined %}
send ia-na 0; # non-temporary address
{% endif %}
+{% if dhcpv6_options is defined and dhcpv6_options.rapid_commit is defined %}
+ send rapid-commit; # wait for immediate reply instead of advertisements
+{% endif %}
{% endif %}
{% if dhcpv6_options is defined and dhcpv6_options.pd is defined %}
{% for pd in dhcpv6_options.pd %}
diff --git a/interface-definitions/include/dhcpv6-options.xml.i b/interface-definitions/include/dhcpv6-options.xml.i
index 5d088b83d..b0a806806 100644
--- a/interface-definitions/include/dhcpv6-options.xml.i
+++ b/interface-definitions/include/dhcpv6-options.xml.i
@@ -70,9 +70,15 @@
</tagNode>
</children>
</tagNode>
+ <leafNode name="rapid-commit">
+ <properties>
+ <help>Wait for immediate reply instead of advertisements</help>
+ <valueless/>
+ </properties>
+ </leafNode>
<leafNode name="temporary">
<properties>
- <help>IPv6 "temporary" address</help>
+ <help>IPv6 temporary address</help>
<valueless/>
</properties>
</leafNode>