use the v4 dictionary format

remove BEGIN-TLV.

Failover-DNS-Removal-Info is a *group*, not a TLV.
The DHCPv6 number space is global.  So option 117 must be
defined globally, even if it can only occur inside of
attribute 116.

diff --git a/share/dictionary/dhcpv6/dictionary.rfc5678 b/share/dictionary/dhcpv6/dictionary.rfc5678
index ec6aa4e2b64231746b1e07d0102a4e211be7e664..257319d5a20380319de4c251211ba9b08a33cc91 100644 (file)
--- a/share/dictionary/dhcpv6/dictionary.rfc5678
+++ b/share/dictionary/dhcpv6/dictionary.rfc5678
@@ -12,17 +12,12 @@
 ##############################################################################
 
 ATTRIBUTE      MOD-Address-List                        54      tlv
-
-BEGIN-TLV      MOD-Address-List
-ATTRIBUTE      IS                                      1       ipv6addr array
-ATTRIBUTE      CS                                      2       ipv6addr array
-ATTRIBUTE      ES                                      3       ipv6addr array
-END-TLV                MOD-Address-List
+ATTRIBUTE      IS                                      .1      ipv6addr array
+ATTRIBUTE      CS                                      .2      ipv6addr array
+ATTRIBUTE      ES                                      .3      ipv6addr array
 
 ATTRIBUTE      MOS-Domain-Name-List                    55      tlv
+ATTRIBUTE      IS                                      .1      string dns_label,array
+ATTRIBUTE      CS                                      .2      string dns_label,array
+ATTRIBUTE      ES                                      .3      string dns_label,array
 
-BEGIN-TLV      MOS-Domain-Name-List
-ATTRIBUTE      IS                                      1       string dns_label,array
-ATTRIBUTE      CS                                      2       string dns_label,array
-ATTRIBUTE      ES                                      3       string dns_label,array
-END-TLV                MOS-Domain-Name-List

diff --git a/share/dictionary/dhcpv6/dictionary.rfc5908 b/share/dictionary/dhcpv6/dictionary.rfc5908
index 670fc6bdaf946d0e938799a78480ba9cfce2a07d..f74351c04d3c9490ed49c5bc6ae0edd4ebb47155 100644 (file)
--- a/share/dictionary/dhcpv6/dictionary.rfc5908
+++ b/share/dictionary/dhcpv6/dictionary.rfc5908
@@ -11,8 +11,6 @@
 ##############################################################################
 
 ATTRIBUTE      NTP-Server                              56      tlv
-BEGIN-TLV      NTP-Server
-ATTRIBUTE      Address                                 1       ipv6addr
-ATTRIBUTE      Multicast-Address                       2       ipv6addr
-ATTRIBUTE      FQDN                                    3       string dns_label
-END-TLV                NTP-Server
+ATTRIBUTE      Address                                 .1      ipv6addr
+ATTRIBUTE      Multicast-Address                       .2      ipv6addr
+ATTRIBUTE      FQDN                                    .3      string dns_label

diff --git a/share/dictionary/dhcpv6/dictionary.rfc8156 b/share/dictionary/dhcpv6/dictionary.rfc8156
index d6b6aac991281cdb8657d58d468c8226c18185f0..48d7caf77064e2f0ef5fad4c82078b0edc6365f0 100644 (file)
--- a/share/dictionary/dhcpv6/dictionary.rfc8156
+++ b/share/dictionary/dhcpv6/dictionary.rfc8156
@@ -23,9 +23,12 @@ VALUE        Failover-Binding-Status         Reset                   8
 ATTRIBUTE      Failover-Connect-Flags                  115     uint16
 VALUE  Failover-Connect-Flags          Fixed-PD-Length         1
 
-ATTRIBUTE      Failover-DNS-Removal-Info               116     tlv
+ATTRIBUTE      Failover-DNS-Removal-Info               116     group
 
-BEGIN-TLV      Failover-DNS-Removal-Info
+#
+#  The next 3 attributes can only occur inside of Failover-DNS-Removal-Info.
+#  However, in DHCPv6, the attribute number space is global.
+#
 ATTRIBUTE      Host-Name                               117     string dns_label
 ATTRIBUTE      Zone-Name                               118     string dns_label
 
@@ -34,7 +37,7 @@ VALUE Flags                           Fwd-Up-To-Date          0x01
 VALUE  Flags                           Rev-Up-To-Date          0x02
 VALUE  Flags                           Synthesized-Name        0x04
 VALUE  Flags                           Using-Requested-FQDN    0x08
-END-TLV                Failover-DNS-Removal-Info
+
 
 ATTRIBUTE      Failover-Expiration-Time                120     date
 ATTRIBUTE      Failover-Max-Unacked-BNDUPD             121     uint32