ttls chbind: update VSA to use

[freeradius.git] / share / dictionary.dhcp

diff --git a/share/dictionary.dhcp b/share/dictionary.dhcp
index 2f77cea..c2971fc 100644 (file)
--- a/share/dictionary.dhcp
+++ b/share/dictionary.dhcp
@@ -1,4 +1,5 @@
 # -*- text -*-
+# Copyright (C) 2011 The FreeRADIUS Server project and contributors
 ##############################################################################
 #
 #      DHCP to RADUS gateway dictionary.
@@ -87,15 +88,15 @@ VALUE       DHCP-Hardware-Type              CAI-TIA-102             33
 
 ##############################################################################
 #
-#      DHCP Options, with comments.  For now, many are as FreeRADIUS
-#      doesn't handle MAC addresses natively.
+#      DHCP Options, with comments.  For now, many are "octets",
+#      as FreeRADIUS doesn't handle complex data structures.
 #
 ##############################################################################
 
 #ATTRIBUTE     DHCP-Pad                                0       octets
 ATTRIBUTE      DHCP-Subnet-Mask                        1       ipaddr
-# Time Offset in
-ATTRIBUTE      DHCP-Time-Offset                        2       octets
+# Time Offset in twos-complement notation.
+ATTRIBUTE      DHCP-Time-Offset                        2       integer
 ATTRIBUTE      DHCP-Router-Address                     3       ipaddr array
 ATTRIBUTE      DHCP-Time-Server                        4       ipaddr array
 ATTRIBUTE      DHCP-IEN-116-Name-Server                5       ipaddr array
@@ -201,23 +202,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-Relay-Circuit-Id                   1       octets
-ATTRIBUTE      DHCP-Relay-Remote-Id                    2       octets
+ATTRIBUTE      DHCP-Agent-Circuit-Id                   82.1    octets
+ATTRIBUTE      DHCP-Agent-Remote-Id                    82.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
@@ -274,8 +277,7 @@ ATTRIBUTE   DHCP-GeoConf-Option                     123     octets
 ATTRIBUTE      DHCP-V-I-Vendor-Class                   124     octets
 # Vendor-Specific
 ATTRIBUTE      DHCP-V-I-Vendor-Specific                125     octets # tlv
-# 6 bytes: E4:45:74:68:00:00
-ATTRIBUTE      DHCP-Etherboot                          128     octets
+ATTRIBUTE      DHCP-Etherboot                          128     ether
 # (for IP Phone software load)
 ATTRIBUTE      DHCP-TFTP-Server-IP-Address             128     octets
 
@@ -350,7 +352,7 @@ VALUE       DHCP-Parameter-Request-List     DHCP-ARP-Cache-Timeout  35
 VALUE  DHCP-Parameter-Request-List     DHCP-Ethernet-Encapsulation 36
 VALUE  DHCP-Parameter-Request-List     DHCP-Default-TCP-TTL    37
 VALUE  DHCP-Parameter-Request-List     DHCP-Keep-Alive-Interval 38
-VALUE  DHCP-Parameter-Request-List     DHCP-Keep=Alive-Garbage 39
+VALUE  DHCP-Parameter-Request-List     DHCP-Keep-Alive-Garbage 39
 VALUE  DHCP-Parameter-Request-List     DHCP-NIS-Domain-Name    40
 VALUE  DHCP-Parameter-Request-List     DHCP-NIS-Servers        41
 VALUE  DHCP-Parameter-Request-List     DHCP-NTP-Servers        42
@@ -430,11 +432,4 @@ VALUE      DHCP-Parameter-Request-List     DHCP-IEEE-802.1Q-L2-Priority 133
 VALUE  DHCP-Parameter-Request-List     DHCP-Diffserv-Code-Point 134
 VALUE  DHCP-Parameter-Request-List     DHCP-HTTP-Proxy         135
 
-#
-#  Don't pay too much attention to these values.  They will be fixed
-#  in a future release.
-#
-ATTRIBUTE DHCP-Agent-Circuit-Id                0x0152                  octets
-ATTRIBUTE DHCP-Agent-Remote-Id         0x0252                  octets
-
 END-VENDOR     DHCP