aboutsummaryrefslogtreecommitdiffstats
path: root/radius
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2015-04-07 18:01:28 +0200
committerAnders Broman <a.broman58@gmail.com>2015-04-16 13:23:35 +0000
commit4171f5590b0df5506c98e559100e21300edb33d0 (patch)
tree8f255b2985777a9fe65f316ab0c1bffdac32f9d5 /radius
parent95f138e407f2afa9a3b26859116a91b99ff25fbc (diff)
RADIUS: Sync with FreeRADIUS Master
commit dec7ff66f34d773d25dee412fe218b4e108d7680 Author: Alan T. DeKok <aland@freeradius.org> Date: Wed Apr 1 13:49:22 2015 -0400 added VALUEs commit 634bdb7b29089ed9fd9548a4ed033bfca82832d2 Author: Alan T. DeKok <aland@freeradius.org> Date: Wed Apr 1 13:34:19 2015 -0400 Added from RFC which has numbers assigned commit 005437d9f260c233f165e5f1a8a0e00ab48d6456 Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org> Date: Thu Mar 26 09:09:13 2015 -0400 Hyphens commit 88332d8e5dc6bae25270500902cdcb511e0e08a6 Author: Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com> Date: Thu Mar 26 12:13:39 2015 +0200 Update dictionary.mikrotik Update dictionary.mikrotik to have new attributes and values mentioned in Mikrotik wiki: http://wiki.mikrotik.com/index.php?title=Manual:RADIUS_Client/vendor_dictionary commit 849336c73dda97ac2a1185f19e21fd2d4d086180 Author: Alan T. DeKok <aland@freeradius.org> Date: Wed Mar 25 15:40:02 2015 -0500 Motorola error message Change-Id: I03ab7666dd64cef75e8ebf088766b6b28497817c Reviewed-on: https://code.wireshark.org/review/7974 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'radius')
-rw-r--r--radius/dictionary1
-rw-r--r--radius/dictionary.mikrotik17
-rw-r--r--radius/dictionary.motorola.wimax2
-rw-r--r--radius/dictionary.rfc749916
4 files changed, 36 insertions, 0 deletions
diff --git a/radius/dictionary b/radius/dictionary
index fae6b6017c..bd773235f1 100644
--- a/radius/dictionary
+++ b/radius/dictionary
@@ -120,6 +120,7 @@ $INCLUDE dictionary.rfc6911
$INCLUDE dictionary.rfc7055
#$INCLUDE dictionary.rfc7155
#$INCLUDE dictionary.rfc7268
+$INCLUDE dictionary.rfc7499
#
# Mostly values which have been allocated by IANA under
diff --git a/radius/dictionary.mikrotik b/radius/dictionary.mikrotik
index ce8634cd03..24b44c740a 100644
--- a/radius/dictionary.mikrotik
+++ b/radius/dictionary.mikrotik
@@ -33,10 +33,27 @@ ATTRIBUTE Mikrotik-Advertise-URL 12 string
ATTRIBUTE Mikrotik-Advertise-Interval 13 integer
ATTRIBUTE Mikrotik-Recv-Limit-Gigawords 14 integer
ATTRIBUTE Mikrotik-Xmit-Limit-Gigawords 15 integer
+ATTRIBUTE Mikrotik-Wireless-PSK 16 string
+ATTRIBUTE Mikrotik-Total-Limit 17 integer
+ATTRIBUTE Mikrotik-Total-Limit-Gigawords 18 integer
+ATTRIBUTE Mikrotik-Address-List 19 string
+ATTRIBUTE Mikrotik-Wireless-MPKey 20 string
+ATTRIBUTE Mikrotik-Wireless-Comment 21 string
+ATTRIBUTE Mikrotik-Delegated-IPv6-Pool 22 string
+ATTRIBUTE Mikrotik-DHCP-Option-Set 23 string
+ATTRIBUTE Mikrotik-DHCP-Option-Param-STR1 24 string
+ATTRIBUTE Mikortik-DHCP-Option-ParamSTR2 25 string
+ATTRIBUTE Mikrotik-Wireless-VLANID 26 integer
+ATTRIBUTE Mikrotik-Wireless-VLANID-Type 27 integer
+ATTRIBUTE Mikrotik-Wireless-Minsignal 28 string
+ATTRIBUTE Mikrotik-Wireless-Maxsignal 29 string
+
# MikroTik Values
VALUE Mikrotik-Wireless-Enc-Algo No-encryption 0
VALUE Mikrotik-Wireless-Enc-Algo 40-bit-WEP 1
VALUE Mikrotik-Wireless-Enc-Algo 104-bit-WEP 2
+VALUE Mikrotik-Wireless-Enc-Algo AES-CCM 3
+VALUE Mikrotik-Wireless-Enc-Algo TKIP 4
END-VENDOR Mikrotik
diff --git a/radius/dictionary.motorola.wimax b/radius/dictionary.motorola.wimax
index 5e55bfba1b..97ffeb377e 100644
--- a/radius/dictionary.motorola.wimax
+++ b/radius/dictionary.motorola.wimax
@@ -29,4 +29,6 @@ ATTRIBUTE Motorola-WiMAX-Convergence-Sublayer 63 octets
ATTRIBUTE Motorola-WiMAX-Service-Flows 64 string
ATTRIBUTE Motorola-WiMAX-VLAN-ID 65 octets
+ATTRIBUTE Motorola-Accounting-Message 80 string
+
END-VENDOR Motorola
diff --git a/radius/dictionary.rfc7499 b/radius/dictionary.rfc7499
new file mode 100644
index 0000000000..069fb50e0e
--- /dev/null
+++ b/radius/dictionary.rfc7499
@@ -0,0 +1,16 @@
+# -*- text -*-
+# Copyright (C) 2015 The FreeRADIUS Server project and contributors
+#
+# Attributes and values defined in RFC 7499.
+# http://www.ietf.org/rfc/rfc7499.txt
+#
+# $Id: 47cfd30f1d036259d0ecb809d442c38efe21493a $
+#
+
+ATTRIBUTE Frag-Status 241.1 integer
+ATTRIBUTE Proxy-State-Length 241.2 integer
+
+VALUE Frag-Status Reserved 0
+VALUE Frag-Status Fragmentation-Supported 1
+VALUE Frag-Status More-Data-Pending 2
+VALUE Frag-Status More-Data-Request 3