From a574a01ab5c02aeb90c6d099dce482c1bf8be096 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 23 Aug 2020 00:16:45 +0200
Subject: 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.
---
 data/templates/dhcp-client/ipv6.tmpl               | 3 +++
 interface-definitions/include/dhcpv6-options.xml.i | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

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>
-- 
cgit v1.2.3