New build path variable

[freeradius.git] / share / dictionary.dhcp

diff --git a/share/dictionary.dhcp b/share/dictionary.dhcp
index 3320e0e..aa146d7 100644 (file)
--- a/share/dictionary.dhcp
+++ b/share/dictionary.dhcp
@@ -42,10 +42,12 @@ ATTRIBUTE   DHCP-Client-IP-Address                  263     ipaddr
 ATTRIBUTE      DHCP-Your-IP-Address                    264     ipaddr
 ATTRIBUTE      DHCP-Server-IP-Address                  265     ipaddr
 ATTRIBUTE      DHCP-Gateway-IP-Address                 266     ipaddr
-ATTRIBUTE      DHCP-Client-Hardware-Address            267     octets    # 16 octets
+ATTRIBUTE      DHCP-Client-Hardware-Address            267     ether     # 16 octets
 ATTRIBUTE      DHCP-Server-Host-Name                   268     string    # 64 octets
 ATTRIBUTE      DHCP-Boot-Filename                      269     string    # 128 octets
 
+ATTRIBUTE      DHCP-Relay-To-IP-Address                270     ipaddr
+
 VALUE  DHCP-Flags                      Broadcast               0x8000
 
 
@@ -197,7 +199,31 @@ 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-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
+
+# 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
@@ -274,7 +300,7 @@ ATTRIBUTE   DHCP-Diffserv-Code-Point                134     octets
 
 ATTRIBUTE      DHCP-HTTP-Proxy                         135     octets
 
-ATTRIBUTE      DHCP-EAP-Message                        254     octets
+ATTRIBUTE      DHCP-Cisco-TFTP-Server-IP-Addresses     150     ipaddr array
 
 ATTRIBUTE      DHCP-End-Of-Options                     255     byte
 
@@ -290,7 +316,6 @@ VALUE       DHCP-Message-Type               DHCP-NAK                6
 VALUE  DHCP-Message-Type               DHCP-Release            7
 VALUE  DHCP-Message-Type               DHCP-Inform             8
 VALUE  DHCP-Message-Type               DHCP-Force-Renew        9
-VALUE  DHCP-Message-Type               DHCP-EAP                254
 
 VALUE  DHCP-Parameter-Request-List     DHCP-Subnet-Mask        1
 VALUE  DHCP-Parameter-Request-List     DHCP-Time-Offset        2
@@ -410,11 +435,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