From: Alan T. DeKok Date: Fri, 21 Dec 2012 12:43:52 +0000 (-0500) Subject: Minor cleanups X-Git-Tag: release_3_0_0_beta1~1344 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=360c0397b5548927722eb06b95c7cbac562e0642;p=thirdparty%2Ffreeradius-server.git Minor cleanups Added documentation on new data types. Re-arranged dictionaries to make a bit more sense. --- diff --git a/share/dictionary b/share/dictionary index cfe5cae3eac..5f42b07c815 100644 --- a/share/dictionary +++ b/share/dictionary @@ -17,17 +17,19 @@ # This file contains dictionary translations for parsing # requests and generating responses. All transactions are # composed of Attribute/Value Pairs. The value of each attribute -# is specified as one of 4 data types. Valid data types are: +# is specified as one of a few data types. Valid data types are: # # text - printable, generally UTF-8 encoded (subset of 'string') # string - 0-253 octets # ipaddr - 4 octets in network byte order -# integer - 32 bit value in big endian order (high byte first) +# ipv4prefix - 1 octet reserved, one octet prefix, 4 octets ipaddr +# integer - 32 bit value in big endian order +# integer64 - 64 bit value in big endian order # date - 32 bit value in big endian order - seconds since # 00:00:00 GMT, Jan. 1, 1970 # ifid - 8 octets in network byte order # ipv6addr - 16 octets in network byte order -# ipv6prefix - 18 octets in network byte order +# ipv6prefix - 1 octet reserved, one octet prefix, 16 octets ipv6addr # # FreeRADIUS includes extended data types which are not defined # in the RFC's. These data types are: @@ -36,7 +38,8 @@ # 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 +# short - 16-bit unsigned integer in network byte order +# signed - 32-bit signed integer in network byte order # octets - raw octets, printed and input as hex strings. # e.g.: 0x123456789abcdef # tlv - type-length-value (only for certain WiMAX attributes) @@ -56,14 +59,23 @@ # # Include compatibility dictionary for older users file. Move # this directive to the end of this file if you want to see the -# old names in the logfiles, INSTEAD OF the new names. +# old names in the logfiles, instead of the new names. # $INCLUDE dictionary.compat + +# +# These dictionaries define attributes in the IETF managed space. +# (i.e. 1..255). This is wrong. We include them here to allow them. +# The IETF allocated ones are listed below, which gives them priority. +# +# i.e. don't do this. Don't use these attributes +# $INCLUDE dictionary.usr.illegal $INCLUDE dictionary.ascend.illegal # -# Include the RFC dictionaries next. +# IETF allocated attributes and values. Split out into +# the RFC which defined them. # # For a complete list of the standard attributes and values, # see: @@ -91,10 +103,20 @@ $INCLUDE dictionary.rfc5607 $INCLUDE dictionary.rfc5904 $INCLUDE dictionary.rfc6519 $INCLUDE dictionary.rfc6572 + +# +# Mostly values which have been allocated by IANA under +# "expert review", but which don't have an RFC associated with them. +# +$INCLUDE dictionary.iana + +# +# This is a prelimanary dictionary until the RFC is published. +# $INCLUDE dictionary.extended # -# Include vendor dictionaries after the standard ones. +# Vendor dictionaries are listed after the standard ones. # $INCLUDE dictionary.3com $INCLUDE dictionary.3gpp @@ -224,41 +246,6 @@ $INCLUDE dictionary.zyxel # # And finally the server internal attributes. +# These are attributes which NEVER go into a RADIUS packet. # $INCLUDE dictionary.freeradius.internal - -# -# Miscellaneous attributes defined in weird places that -# don't really belong anywhere else... -# -ATTRIBUTE Originating-Line-Info 94 string - -# As defined in draft-sterman-aaa-sip-00.txt -ATTRIBUTE Digest-Response 206 string -ATTRIBUTE Digest-Attributes 207 octets # stupid format - -# -# Integer Translations -# -VALUE Service-Type Voice 12 -VALUE Service-Type Fax 13 -VALUE Service-Type Modem-Relay 14 -VALUE Service-Type IAPP-Register 15 -VALUE Service-Type IAPP-AP-Check 16 - -VALUE Framed-Protocol GPRS-PDP-Context 7 - -VALUE NAS-Port-Type Wireless-CDMA2000 22 -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 diff --git a/share/dictionary.iana b/share/dictionary.iana new file mode 100644 index 00000000000..cee555de98e --- /dev/null +++ b/share/dictionary.iana @@ -0,0 +1,44 @@ +# -*- text -*- +# Copyright (C) 2011 The FreeRADIUS Server project and contributors +# +# Mostly values which have been allocated by IANA under +# "expert review", but which don't have an RFC associated with them. +# +# $Id$ +# + +# RFC 4005 +ATTRIBUTE Originating-Line-Info 94 string + +# draft-sterman-aaa-sip-00.txt +# +# This is bad... at some point the IETF will allocate these. +# +ATTRIBUTE Digest-Response 206 string +ATTRIBUTE Digest-Attributes 207 octets # stupid format + +# +# Integer Translations +# +VALUE Service-Type Voice 12 +VALUE Service-Type Fax 13 +VALUE Service-Type Modem-Relay 14 +VALUE Service-Type IAPP-Register 15 +VALUE Service-Type IAPP-AP-Check 16 + +VALUE Framed-Protocol GPRS-PDP-Context 7 + +VALUE NAS-Port-Type Wireless-CDMA2000 22 +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