Add sub-options to Option 82

diff --git a/share/dictionary.dhcp b/share/dictionary.dhcp
index aac3952..2f77cea 100644 (file)
--- a/share/dictionary.dhcp
+++ b/share/dictionary.dhcp
@@ -199,7 +199,26 @@ ATTRIBUTE  DHCP-Rapid-Commit                       80      octets
 # Fully Qualified Domain Name
 ATTRIBUTE      DHCP-Client-FQDN                        81      string
 # Relay Agent Information
-ATTRIBUTE      DHCP-Relay-Agent-Information            82      octets # tlv
+ATTRIBUTE      DHCP-Relay-Agent-Information            82      tlv
+
+BEGIN-TLV      DHCP-Relay-Agent-Information
+ATTRIBUTE      DHCP-Relay-Circuit-Id                   1       octets
+ATTRIBUTE      DHCP-Relay-Remote-Id                    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
+
+# AGH!  RADIUS inside of DHCP!
+ATTRIBUTE      DHCP-RADIUS-Attributes                  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
+
 # Internet Storage Name Service
 ATTRIBUTE      DHCP-iSNS                               83      octets
 # Novell Directory Services