Fix encapsulated options.

[thirdparty/dhcpcd.git] / dhcpcd-definitions.conf

diff --git a/dhcpcd-definitions.conf b/dhcpcd-definitions.conf
index 7c20d9d99ca4c923e831ea70e34c9823b6461251..96984493c727ed5b9461631153a00b081a1d626b 100644 (file)
--- a/dhcpcd-definitions.conf
+++ b/dhcpcd-definitions.conf
@@ -134,41 +134,23 @@ define 212        rfc5969                 sixrd
 define6 1      binhex                  client_id
 define6 2      binhex                  server_id
 
-# DHCPv6 addresses.
-# These are currently handled internally by dhcpcd(8) and only
-# the addresses are exposed to dhcpcd-run-hooks(8).
-# When they can be expressed properly they will be uncommented.
-# many signifies that it could occur more than once and be index.
-# option signifies that the specified option can be encapsulated.
-# For example:
-#      ia_na_count=1
-#      ia_na_1_iaid="00112233"
-#      ia_na_1_t1=3600
-#      ia_na_1_t2=7200
-#      ia_na_1_ia_addr_count=1
-#      ia_na_1_ia_addr_1_addr="dead:beef"
-#      ia_na_1_ia_addr_1_pltime="3600"
-#      ia_na_1_ia_addr_1_pltime="7200"
-#      ia_na_1_ia_addr_1_status_code=0
-#      ia_na_1_ia_addr_1_status_code_message="OK"
-#      ia_na_1_code=0
-#      ia_na_1_status_code_message="OK"
-#
-#define6 3     embed many              ia_na
-#embed         uint32                  iaid
-#embed         uint32                  t1
-#embed         uint32                  t2
-#encap         option                  5
-#encap         option                  13
-#define6 4     embed many              ia_ta
-#embed         uint32                  iaid
-#encap         option                  5
-#encap         option                  13
-#define6 5     embed many              ia_addr
-#embed         ip6address              addr
-#embed         uint32                  pltime
-#embed         uint32                  vltime
-#encap         option                  13
+define6 3      norequest index embed   ia_na
+embed          binhex:4                iaid
+embed          uint32                  t1
+embed          uint32                  t2
+encap 5                option
+encap 13       option
+
+define6 4      norequest index embed   ia_ta
+embed          uint32                  iaid
+encap 5                option
+encap 13       option
+
+define6 5      norequest index embed   ia_addr
+embed          ip6address              ia_addr
+embed          uint32                  pltime
+embed          uint32                  vltime
+encap 13       option
 
 define6 6      array uint16            option_request
 define6 7      byte                    preference
@@ -203,6 +185,19 @@ define6 22 array ip6address        sip_servers_addresses
 define6 23     array ip6address        name_servers
 define6 24     domain                  domain_search
 
+# DHCPv6 Prefix Options, RFC6603
+define6 25     norequest index embed   ia_pd
+embed          binhex:4                iaid
+embed          uint32                  t1
+embed          uint32                  t2
+encap 26       option
+
+define 26      index embed             prefix
+embed          uint32                  pltime
+embed          uint32                  vltime
+embed          ip6address              prefix
+encap 13       option
+
 # DHCPv6 Network Information Service Options, RFC3898
 define6 27     array ip6address        nis_servers
 define6 28     array ip6address        nisp_servers