From 67159be03d06dca32567fc54acf5b39d249a7ee7 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Fri, 15 May 2015 18:17:39 +0200 Subject: [PATCH] RADIUS: Sync with FreeRADIUS Master commit 917d8af3bbb3d9f4bea4aa437d244a655cc69291 Author: Alan T. DeKok Date: Wed May 13 12:38:42 2015 -0400 formatting commit 0b0c515fa8facbca66f31fbb18dd4ad632e2c200 Author: skids Date: Wed May 13 12:25:14 2015 -0400 Add new port bounce attribute from Aruba This attribute was added in ArubaOS 7.4.0.3 for the Aruba Mobility Access Switch commit 17547a39413af58a7e4622d9d74af87ce2f52630 Author: Jorge Pereira Date: Thu May 7 19:51:24 2015 -0300 Updating the Alcatel 7750 dictionary based on "9304720101_V1_7750 SR-OSRADIUS ATTRIBUTE.pdf" document. commit ba4682aee27bd0aa87f67dbd8af4242c86e33015 Author: Arran Cudbard-Bell Date: Wed Apr 22 22:06:01 2015 +0100 Update ericsson.ab dictionary to include new accounting VSAs commit a1c76e847ad0058fcd924ed7f3974ac65e06695d Author: Arran Cudbard-Bell Date: Sat Apr 18 09:50:41 2015 +0100 If it's binary in radiator, it should be octets in FreeRADIUS From me: Add also some missing VSA on ericson.ab dicto Change-Id: I440c9006dc72388a45ba9a13225ecddf4773ae97 Reviewed-on: https://code.wireshark.org/review/8471 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte Reviewed-by: Anders Broman --- radius/dictionary.alcatel.sr | 17 +++++++++++++++++ radius/dictionary.aruba | 10 ++++++---- radius/dictionary.ericsson.ab | 25 +++++++++++++++++++++---- 3 files changed, 44 insertions(+), 8 deletions(-) diff --git a/radius/dictionary.alcatel.sr b/radius/dictionary.alcatel.sr index facf71d8b7..726c6a8169 100644 --- a/radius/dictionary.alcatel.sr +++ b/radius/dictionary.alcatel.sr @@ -59,4 +59,21 @@ ATTRIBUTE Alc-Acct-I-Outprof-Pkts-64 24 integer ATTRIBUTE Alc-Acct-O-Inprof-Pkts-64 25 integer ATTRIBUTE Alc-Acct-O-Outprof-Pkts-64 26 integer +# Used when authenticating migrant hosts +ATTRIBUTE Alc-Wlan-Portal-Redirect 172 string + +# If a migrant host is redirected, specifies the URL +ATTRIBUTE Alc-Wlan-Portal-Url 173 string + +# Defines the lease-time in seconds for RADIUS proxy and create-host-CoA +# scenarios only. +ATTRIBUTE Alc-Lease-Time 174 integer + +# The URL to which traffic matching the host IPv4 filter entry with http-redirect +# action is redirected to +ATTRIBUTE Alc-Portal-Url 177 string + +# names longer than the allowed maximum are treated as host setup failures +ATTRIBUTE Alc-SLAAC-IPv6-Pool 181 string + END-VENDOR Alcatel-Lucent-Service-Router diff --git a/radius/dictionary.aruba b/radius/dictionary.aruba index b710e6f9d4..c9bbe79e82 100644 --- a/radius/dictionary.aruba +++ b/radius/dictionary.aruba @@ -49,10 +49,12 @@ ATTRIBUTE Aruba-User-Group 36 string ATTRIBUTE Aruba-Network-SSO-Token 37 string ATTRIBUTE Aruba-AirGroup-Version 38 integer -VALUE Aruba-AirGroup-Device-Type Personal-Device 1 -VALUE Aruba-AirGroup-Device-Type Shared-Device 2 +ATTRIBUTE Aruba-Port-Bounce-Host 40 integer -VALUE Aruba-AirGroup-Version AirGroup-v1 1 -VALUE Aruba-AirGroup-Version AirGroup-v2 2 +VALUE Aruba-AirGroup-Device-Type Personal-Device 1 +VALUE Aruba-AirGroup-Device-Type Shared-Device 2 + +VALUE Aruba-AirGroup-Version AirGroup-v1 1 +VALUE Aruba-AirGroup-Version AirGroup-v2 2 END-VENDOR Aruba diff --git a/radius/dictionary.ericsson.ab b/radius/dictionary.ericsson.ab index 24135977f9..aa535b8ad0 100644 --- a/radius/dictionary.ericsson.ab +++ b/radius/dictionary.ericsson.ab @@ -445,14 +445,30 @@ ATTRIBUTE Acct-Alt-Session-ID 197 string ATTRIBUTE Idle-Timeout-Threshold 198 integer ATTRIBUTE Double-Authentication 199 integer ATTRIBUTE SBC-Adjacency 200 string -#binary in radiator -ATTRIBUTE DHCP-Field 201 string -#binary in radiator -ATTRIBUTE DHCP-Option 202 string +ATTRIBUTE DHCP-Field 201 octets +ATTRIBUTE DHCP-Option 202 octets ATTRIBUTE Security-Service 203 string ATTRIBUTE Reauth-Service-Name 204 string ATTRIBUTE Flow-IP-Profile 205 string ATTRIBUTE Radius-Throttle-Watermark 206 integer +ATTRIBUTE RB-IPV6-DNS 207 string +ATTRIBUTE RB-IPv6-Option 208 string +ATTRIBUTE Cluster-Partition-ID 209 string +ATTRIBUTE Circuit-Group-Member 210 string +ATTRIBUTE Delegated-Max-Prefix 212 integer +ATTRIBUTE IPv4-Address-Release-Control 213 string +ATTRIBUTE Acct-Input-IPv4-Octet 214 integer +ATTRIBUTE Acct-Output-IPv4-Octets 215 integer +ATTRIBUTE Acct-Input-IPv4-Packets 216 integer +ATTRIBUTE Acct-Output-IPv4-Packets 217 integer +ATTRIBUTE Acct-Input-IPv4-Gigawords 218 integer +ATTRIBUTE Acct-Output-IPv4-Gigawords 219 integer +ATTRIBUTE Acct-Input-IPv6-Octets 220 integer +ATTRIBUTE Acct-Output-IPv6-Octets 221 integer +ATTRIBUTE Acct-Input-IPv6-Packets 222 integer +ATTRIBUTE Acct-Output-IPv6-Packets 223 integer +ATTRIBUTE Acct-Input-IPv6-Gigawords 224 integer +ATTRIBUTE Acct-Output-IPv6-Gigawords 225 integer VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-RAW 1 VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-ROUTE1483 2 @@ -534,6 +550,7 @@ VALUE Mcast-Receive RECEIVE 2 VALUE Tunnel-DNIS DNIS 1 VALUE Tunnel-DNIS DNIS-Only 2 +VALUE Tunnel-DNIS DNIS-Generate 4 VALUE Platform-Type SMS 1 VALUE Platform-Type SmartEdge-800 2