From e8487cdc1dc13926971de1329da0451ee3a044e4 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Wed, 12 Sep 2018 05:47:50 +0000 Subject: [PATCH] radius: sync with FreeRADIUS commit 8ffdba5aa45427bfc13a1c4638ddbf0d49c7542b Author: Peter Lemenkov Date: Sun Aug 19 20:44:06 2018 +0200 Proper letter case IP-TOS-Field was renamed to IP-Tos-Field in commit c6670b1ac3e137df8f0af47103a82d1a575330f3. Let's rename it back to avoid any confusion. Similar changes for 3GPP-RAT-Type in dictionary.3gpp and for Unisphere-PPP-Protocol in dictionary.unisphere. Signed-off-by: Peter Lemenkov commit 43603a7234821354c69205a16945a19315e6fa4e Author: Peter Lemenkov Date: Sun Aug 19 19:37:08 2018 +0200 Looks like this attribute should be 70 Signed-off-by: Peter Lemenkov commit 070428a01041316c45f4670f709e0f37213a4255 Author: Peter Lemenkov Date: Sun Aug 19 19:36:47 2018 +0200 Remove duplicated attribute definitions Signed-off-by: Peter Lemenkov Change-Id: I71951e0fa677396860f61fcd66922b969054fe06 Reviewed-on: https://code.wireshark.org/review/29625 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- radius/dictionary.cisco.asa | 5 ++--- radius/dictionary.unisphere | 43 +++++++++++++++++++++++++++++++------ 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/radius/dictionary.cisco.asa b/radius/dictionary.cisco.asa index 0b5b0a5c52..e0a609e628 100644 --- a/radius/dictionary.cisco.asa +++ b/radius/dictionary.cisco.asa @@ -5,7 +5,7 @@ # # http://www.cisco.com/en/US/docs/security/asa/asa90/configuration/guide/ref_extserver.html#wp1802187 # -# $Id: 5b6ff356a8f4e85fd8b057c3ecf30465cd487ba6 $ +# $Id: bd5b425d6d8aef0a47ff06ae3110ff1b5a1e307d $ # VENDOR Cisco-ASA 3076 @@ -61,10 +61,9 @@ ATTRIBUTE ASA-Allow-Network-Extension-Mode 64 integer ATTRIBUTE ASA-Authorization-Type 65 integer ATTRIBUTE ASA-Authorization-Required 66 integer ATTRIBUTE ASA-Authorization-DN-Field 67 string -ATTRIBUTE ASA-Authorization-DN-Field 67 string ATTRIBUTE ASA-IKE-KeepAlive-Confidence-Interval 68 integer ATTRIBUTE ASA-WebVPN-Content-Filter-Parameters 69 integer -ATTRIBUTE ASA-WebVPN-HTML-Filter 69 integer +ATTRIBUTE ASA-WebVPN-HTML-Filter 70 integer ATTRIBUTE ASA-WebVPN-URL-List 71 string ATTRIBUTE ASA-WebVPN-Port-Forwarding-List 72 string ATTRIBUTE ASA-WebVPN-Access-List 73 string diff --git a/radius/dictionary.unisphere b/radius/dictionary.unisphere index dc11c2b7ab..a5431093e3 100644 --- a/radius/dictionary.unisphere +++ b/radius/dictionary.unisphere @@ -6,7 +6,7 @@ # Juniper's (was Unisphere's) broadband RAS # From Terje Krogdahl # -# Version: $Id: d9eab0c853621e95f16f295c8f82f6204a4f917b $ +# Version: $Id: a950e241de865770f73cf8a6cccfb930cc6330e2 $ # # This dictionary applies to access services on Juniper JUNOS (M/MX) @@ -221,11 +221,40 @@ ATTRIBUTE Jnpr-Vlan-Map-Id 160 integer ATTRIBUTE Jnpr-IPv6-Delegated-Pool-Name 161 string ATTRIBUTE Jnpr-Tx-Connect-Speed 162 integer ATTRIBUTE Jnpr-Rx-Connect-Speed 163 integer +ATTRIBUTE Unisphere-Ipv4-release-control 164 string +ATTRIBUTE Pcp-Server-Name 165 string -# ATTRIBUTE 164 - 173 RESERVED +# ATTRIBUTE 166 - 173 RESERVED ATTRIBUTE Unisphere-Client-Profile-Name 174 string ATTRIBUTE Jnpr-Redirect-GW-Address 175 ipaddr ATTRIBUTE Jnpr-APN-Name 176 string +ATTRIBUTE Unisphere-Cos-Shaping-Rate 177 string +ATTRIBUTE Unisphere-Action-Reason 178 string +ATTRIBUTE Unisphere-Service-Volume-Gigawords 179 integer has_tag +ATTRIBUTE Unisphere-Update-Service 180 string has_tag + +ATTRIBUTE Unisphere-Acc-Loop-Remote-Id 182 string +ATTRIBUTE Unisphere-Acc-Loop-Encap 183 octets +ATTRIBUTE Unisphere-Inner-Vlan-Map-Id 184 integer +ATTRIBUTE Unisphere-Core-Facing-Interface 185 string +ATTRIBUTE Unisphere-Pcp-Port-Map 186 string +ATTRIBUTE Unisphere-vCPE-Lan-Extension 187 string +ATTRIBUTE Unisphere-vCPE-IPv4-Offload 188 string + +ATTRIBUTE Jnpr-Input-Interface-Filter 191 string +ATTRIBUTE Jnpr-Output-Interface-Filter 192 string +ATTRIBUTE ERX-Bulk-CoA-Transaction-Id 194 integer +ATTRIBUTE ERX-Bulk-CoA-Identifier 195 integer +ATTRIBUTE Unisphere-IPv4-Input-Service-Set 196 string +ATTRIBUTE Unisphere-IPv4-Output-Service-Set 197 string +ATTRIBUTE Unisphere-IPv4-Input-Service-Filter 198 string +ATTRIBUTE Unisphere-IPv4-Output-Service-Filter 199 string +ATTRIBUTE Unisphere-IPv6-Input-Service-Set 200 string +ATTRIBUTE Unisphere-IPv6-Output-Service-Set 201 string +ATTRIBUTE Unisphere-IPv6-Input-Service-Filter 202 string +ATTRIBUTE Unisphere-IPv6-Output-Service-Filter 203 string +ATTRIBUTE Unisphere-Adv-Pcef-Profile-Name 204 string +ATTRIBUTE Unisphere-Adv-Pcef-Rule-Name 205 string # # Values Attribute Name Number @@ -267,11 +296,11 @@ VALUE Unisphere-Qos-Profile-Interface-Type PPPOE-SUB 12 VALUE Unisphere-Nas-Port-Method None 0 VALUE Unisphere-Nas-Port-Method CISCO-CLID 1 -VALUE Unisphere-Ppp-Protocol None 0 -VALUE Unisphere-Ppp-Protocol PAP 1 -VALUE Unisphere-Ppp-Protocol CHAP 2 -VALUE Unisphere-Ppp-Protocol PAP-CHAP 3 -VALUE Unisphere-Ppp-Protocol CHAP-PAP 4 +VALUE Unisphere-PPP-Protocol None 0 +VALUE Unisphere-PPP-Protocol PAP 1 +VALUE Unisphere-PPP-Protocol CHAP 2 +VALUE Unisphere-PPP-Protocol PAP-CHAP 3 +VALUE Unisphere-PPP-Protocol CHAP-PAP 4 VALUE Unisphere-Tunnel-Bearer-Type None 0 VALUE Unisphere-Tunnel-Bearer-Type Analog 1