Convert BEGIN-TLV to tlv.attr

diff --git a/share/dictionary.dhcp b/share/dictionary.dhcp
index 92c0c383347505c456e1cd030bc54fef145357b1..e95e5d936c714c05e8f50633d6021a97d1a286cd 100644 (file)
--- a/share/dictionary.dhcp
+++ b/share/dictionary.dhcp
@@ -201,28 +201,25 @@ ATTRIBUTE DHCP-Client-FQDN                        81      string
 # Relay Agent Information
 ATTRIBUTE      DHCP-Relay-Agent-Information            82      tlv
 
-BEGIN-TLV      DHCP-Relay-Agent-Information
+ATTRIBUTE      DHCP-Agent-Circuit-Id                   82.1    octets
+ATTRIBUTE      DHCP-Agent-Remote-Id                    82.2    octets
 
-ATTRIBUTE      DHCP-Agent-Circuit-Id                   1       octets
-ATTRIBUTE      DHCP-Agent-Remote-Id                    2       octets
-
-ATTRIBUTE      DHCP-Relay-Circuit-Id                   1       octets
-ATTRIBUTE      DHCP-Relay-Remote-Id                    2       octets
+ATTRIBUTE      DHCP-Relay-Circuit-Id                   82.1    octets
+ATTRIBUTE      DHCP-Relay-Remote-Id                    82.2    octets
 
 # 3 is reserved and shouldn't be used for anything
-ATTRIBUTE      DHCP-Docsis-Device-Class                4       integer
-ATTRIBUTE      DHCP-Relay-Link-Selection               5       ipaddr  
-ATTRIBUTE      DHCP-Subscriber-Id                      6       string
+ATTRIBUTE      DHCP-Docsis-Device-Class                82.4    integer
+ATTRIBUTE      DHCP-Relay-Link-Selection               82.5    ipaddr  
+ATTRIBUTE      DHCP-Subscriber-Id                      82.6    string
 
 # AGH!  RADIUS inside of DHCP!
-ATTRIBUTE      DHCP-RADIUS-Attributes                  7       octets
+ATTRIBUTE      DHCP-RADIUS-Attributes                  82.7    octets
 
 # Horribly complicated
-ATTRIBUTE      DHCP-Authentication-Information         8       octets
-ATTRIBUTE      DHCP-Vendor-Specific-Information        9       octets
-ATTRIBUTE      DHCP-Relay-Agent-Flags                  10      byte
-ATTRIBUTE      DHCP-Server-Identifier-Override         11      ipaddr
-END-TLV                DHCP-Relay-Agent-Information
+ATTRIBUTE      DHCP-Authentication-Information         82.8    octets
+ATTRIBUTE      DHCP-Vendor-Specific-Information        82.9    octets
+ATTRIBUTE      DHCP-Relay-Agent-Flags                  82.10   byte
+ATTRIBUTE      DHCP-Server-Identifier-Override         82.11   ipaddr
 
 # Internet Storage Name Service
 ATTRIBUTE      DHCP-iSNS                               83      octets