aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am1
-rw-r--r--packaging/nsis/wireshark.nsi1
-rw-r--r--radius/dictionary1
-rw-r--r--radius/dictionary.mikrotik17
-rw-r--r--radius/dictionary.motorola.wimax2
-rw-r--r--radius/dictionary.rfc749916
6 files changed, 38 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 384a7697e6..8e52e630be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -275,6 +275,7 @@ dist_radius_DATA = $(_CUSTOM_radius_dict_) \
radius/dictionary.rfc7055 \
radius/dictionary.rfc7155 \
radius/dictionary.rfc7268 \
+ radius/dictionary.rfc7499 \
radius/dictionary.riverbed \
radius/dictionary.riverstone \
radius/dictionary.roaringpenguin \
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 09e20b5ff8..5e54ba1a84 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -590,6 +590,7 @@ File "${STAGING_DIR}\radius\dictionary.rfc6930"
File "${STAGING_DIR}\radius\dictionary.rfc7055"
File "${STAGING_DIR}\radius\dictionary.rfc7155"
File "${STAGING_DIR}\radius\dictionary.rfc7268"
+File "${STAGING_DIR}\radius\dictionary.rfc7499"
File "${STAGING_DIR}\radius\dictionary.riverbed"
File "${STAGING_DIR}\radius\dictionary.riverstone"
File "${STAGING_DIR}\radius\dictionary.roaringpenguin"
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