Added attributes for RFC 5447

[freeradius.git] / share / dictionary

diff --git a/share/dictionary b/share/dictionary
index 8c31a31..a2e3592 100644 (file)
--- a/share/dictionary
+++ b/share/dictionary
@@ -1,4 +1,5 @@
 # -*- text -*-
+# Copyright (C) 2011 The FreeRADIUS Server project and contributors
 #
 # Version $Id$
 #
@@ -27,15 +28,18 @@
 #      ifid       - 8 octets in network byte order
 #      ipv6addr   - 16 octets in network byte order
 #      ipv6prefix - 18 octets in network byte order
-#      ether      - 6 octets of hh:hh:hh:hh:hh:hh
-#                   where 'h' is hex digits, upper or lowercase.
 #
 #      FreeRADIUS includes extended data types which are not defined
 #      in the RFC's.  These data types are:
 #
 #      abinary - Ascend's binary filter format.
+#      byte    - 8 bit unsigned integer
+#      ether   - 6 octets of hh:hh:hh:hh:hh:hh
+#                where 'h' is hex digits, upper or lowercase.
+#      short   - 16-bit unsigned integer 
 #      octets  - raw octets, printed and input as hex strings.
 #                e.g.: 0x123456789abcdef
+#      tlv     - type-length-value (only for certain WiMAX attributes)
 #
 #
 #      Enumerated values are stored in the user file with dictionary
@@ -55,6 +59,8 @@
 #      old names in the logfiles, INSTEAD OF the new names.
 #
 $INCLUDE dictionary.compat
+$INCLUDE dictionary.usr.illegal
+$INCLUDE dictionary.ascend.illegal
 
 #
 #      Include the RFC dictionaries next.
@@ -73,9 +79,17 @@ $INCLUDE dictionary.rfc3576
 $INCLUDE dictionary.rfc3580
 $INCLUDE dictionary.rfc4072
 $INCLUDE dictionary.rfc4372
+$INCLUDE dictionary.rfc4603
 $INCLUDE dictionary.rfc4675
 $INCLUDE dictionary.rfc4679
+$INCLUDE dictionary.rfc4818
+$INCLUDE dictionary.rfc4849
 $INCLUDE dictionary.rfc5176
+$INCLUDE dictionary.rfc5447
+$INCLUDE dictionary.rfc5580
+$INCLUDE dictionary.rfc5607
+$INCLUDE dictionary.rfc5904
+$INCLUDE dictionary.extended
 
 #
 #      Include vendor dictionaries after the standard ones.
@@ -84,8 +98,10 @@ $INCLUDE dictionary.3com
 $INCLUDE dictionary.3gpp
 $INCLUDE dictionary.3gpp2
 $INCLUDE dictionary.acc
+$INCLUDE dictionary.acme
 $INCLUDE dictionary.airespace
 $INCLUDE dictionary.alcatel
+$INCLUDE dictionary.alcatel.sr
 $INCLUDE dictionary.alteon
 $INCLUDE dictionary.alvarion
 $INCLUDE dictionary.apc
@@ -96,6 +112,7 @@ $INCLUDE dictionary.bay
 $INCLUDE dictionary.bintec
 $INCLUDE dictionary.cablelabs
 $INCLUDE dictionary.cabletron
+$INCLUDE dictionary.chillispot
 $INCLUDE dictionary.cisco
 #
 #       The Cisco VPN300 dictionary is the same as the altiga one.
@@ -107,13 +124,15 @@ $INCLUDE dictionary.cisco.bbsm
 $INCLUDE dictionary.clavister
 $INCLUDE dictionary.colubris
 $INCLUDE dictionary.cosine
-#$INCLUDE dictionary.dhcp
 $INCLUDE dictionary.digium
+$INCLUDE dictionary.eltex
 $INCLUDE dictionary.epygi
 $INCLUDE dictionary.erx
 $INCLUDE dictionary.ericsson
 $INCLUDE dictionary.extreme
+$INCLUDE dictionary.f5
 $INCLUDE dictionary.freeradius
+$INCLUDE dictionary.freeswitch
 $INCLUDE dictionary.fortinet
 $INCLUDE dictionary.foundry
 $INCLUDE dictionary.gandalf
@@ -121,12 +140,15 @@ $INCLUDE dictionary.gemtek
 $INCLUDE dictionary.h3c
 $INCLUDE dictionary.hp
 $INCLUDE dictionary.huawei
+$INCLUDE dictionary.iea
+$INCLUDE dictionary.infonet
 $INCLUDE dictionary.issanni
 $INCLUDE dictionary.itk
 $INCLUDE dictionary.ipunplugged
 $INCLUDE dictionary.juniper
 $INCLUDE dictionary.jradius
 $INCLUDE dictionary.karlnet
+$INCLUDE dictionary.lancom
 $INCLUDE dictionary.livingston
 $INCLUDE dictionary.localweb
 $INCLUDE dictionary.lucent
@@ -134,8 +156,11 @@ $INCLUDE dictionary.manzara
 $INCLUDE dictionary.merit
 $INCLUDE dictionary.microsoft
 $INCLUDE dictionary.mikrotik
+$INCLUDE dictionary.motorola
+$INCLUDE dictionary.motorola.wimax
 $INCLUDE dictionary.navini
 $INCLUDE dictionary.netscreen
+$INCLUDE dictionary.networkphysics
 $INCLUDE dictionary.nexans
 $INCLUDE dictionary.ntua
 $INCLUDE dictionary.nokia
@@ -161,14 +186,18 @@ $INCLUDE dictionary.riverstone
 $INCLUDE dictionary.roaringpenguin
 $INCLUDE dictionary.shasta
 $INCLUDE dictionary.shiva
+$INCLUDE dictionary.siemens
 $INCLUDE dictionary.slipstream
 $INCLUDE dictionary.sonicwall
 $INCLUDE dictionary.springtide
 $INCLUDE dictionary.starent
+$INCLUDE dictionary.symbol
 $INCLUDE dictionary.telebit
 $INCLUDE dictionary.trapeze
 $INCLUDE dictionary.tropos
 $INCLUDE dictionary.t_systems_nova
+$INCLUDE dictionary.ukerna
+$INCLUDE dictionary.unix
 $INCLUDE dictionary.usr
 $INCLUDE dictionary.utstarcom
 $INCLUDE dictionary.valemount
@@ -176,9 +205,12 @@ $INCLUDE dictionary.versanet
 $INCLUDE dictionary.vqp
 $INCLUDE dictionary.waverider
 $INCLUDE dictionary.walabi
+$INCLUDE dictionary.wichorus
+$INCLUDE dictionary.wimax
 $INCLUDE dictionary.wispr
 $INCLUDE dictionary.xedia
 $INCLUDE dictionary.xylan
+$INCLUDE dictionary.zyxel
 
 #
 #      And finally the server internal attributes.
@@ -211,4 +243,12 @@ VALUE      NAS-Port-Type                   Wireless-UMTS           23
 VALUE  NAS-Port-Type                   Wireless-1X-EV          24
 VALUE  NAS-Port-Type                   IAPP                    25
 
+VALUE   NAS-Port-Type                   FTTP                    26
+VALUE   NAS-Port-Type                   Wireless-802.16         27
+VALUE   NAS-Port-Type                   Wireless-802.20         28
+VALUE   NAS-Port-Type                   Wireless-802.22         29
+
+VALUE   NAS-Port-Type                   xPON                    35
+VALUE   NAS-Port-Type                   Wireless-XGP            36
+
 VALUE  Framed-Protocol                 PPTP                    9