dhcp6: Softwire Address and Port-Mapped Clients, RFC7598

Add support for these options.
Untested, should work aside from the documented issue, patches welcome.

diff --git a/src/dhcpcd-definitions.conf b/src/dhcpcd-definitions.conf
index f8117d277f855e485adf9f2b4366ca394ed7ce60..e0ab2b79f2e94dc6883592fdf04a6423c2f780a1 100644 (file)
--- a/src/dhcpcd-definitions.conf
+++ b/src/dhcpcd-definitions.conf
@@ -579,6 +579,37 @@ define6 80 ip6address              link_address
 define6 82     request uint32          sol_max_rt
 define6        83      request uint32          inf_max_rt
 
+# DHCPv6 Softwire Address and Port-Mapped Clients, RFC7598
+define6        89      embed                   s46_rule
+embed          bitflags=0000000F       flags
+embed          byte                    ea_len
+embed          byte                    prefix4_len
+embed          ipaddress               ipv4_prefix
+embed          ip6address              ipv6_prefix
+define6        90      ip6address              s64_br
+define6        91      embed                   s46_dmr
+embed          byte                    prefix_len
+embed          binhex                  prefix
+define6        92      embed                   s46_v4v6bind
+embed          ipaddress               ipv4_address
+embed          byte                    ipv6_prefix_len
+embed          binhex                  ipv6_prefix_and_options
+# Cannot decode options after variable length address ...
+#encap 93      option
+define6        93      embed                   s46_portparams
+embed          byte                    offset
+embed          byte                    psid_len
+embed          uint16                  psid
+define6        94      embed                   s46_cont_mape
+encap  89      option
+encap  90      option
+define6        95      embed                   s46_cont_mapt
+encap  89      option
+encap  91      option
+define6        96      embed                   s46_cont_lw
+encap  90      option
+encap  92      option
+
 # DHCPv6 Address Selection Policy
 # Currently not supported