From 8cdaaa241e04e3b096d2ef417bd0ac30ae56670d Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 29 May 2017 15:40:04 -0700 Subject: Another update from FreeRADIUS. Copyright, whitespace changs, adds missing END-VENDOR. Change-Id: I1219f83a99e4ebee3af70498848a0b440c6c3bc1 Reviewed-on: https://code.wireshark.org/review/21799 Reviewed-by: Guy Harris --- radius/dictionary.wimax.wichorus | 109 +++++++++++++++++++-------------------- 1 file changed, 54 insertions(+), 55 deletions(-) (limited to 'radius') diff --git a/radius/dictionary.wimax.wichorus b/radius/dictionary.wimax.wichorus index 2b61d69fff..02b2007bbc 100644 --- a/radius/dictionary.wimax.wichorus +++ b/radius/dictionary.wimax.wichorus @@ -1,4 +1,5 @@ # -*- text -*- +# Copyright (C) 2015 The FreeRADIUS Server project and contributors ############################################################################## # # This is a WiMAX dictionary for the WiChorus line of products. @@ -7,7 +8,7 @@ # ############################################################################## # -# $Id$ +# $Id: c3dd1e620496eba6467928136d0c81dcb907eb7b $ # ############################################################################## @@ -15,36 +16,36 @@ VENDOR WiMAX 24757 format=1,1,c BEGIN-VENDOR WiMAX -ATTRIBUTE WiMAX-Capability 1 tlv +ATTRIBUTE WiMAX-Capability 1 tlv BEGIN-TLV WiMAX-Capability -ATTRIBUTE WiMAX-Release 1 string -ATTRIBUTE WiMAX-Accounting-Capabilities 2 byte -ATTRIBUTE WiMAX-Hotlining-Capabilities 3 byte -ATTRIBUTE WiMAX-Idle-Mode-Notification-Cap 4 byte -ATTRIBUTE WiMAX-Packet-Flow-Descriptor-Capabilities 5 byte +ATTRIBUTE WiMAX-Release 1 string +ATTRIBUTE WiMAX-Accounting-Capabilities 2 byte +ATTRIBUTE WiMAX-Hotlining-Capabilities 3 byte +ATTRIBUTE WiMAX-Idle-Mode-Notification-Cap 4 byte +ATTRIBUTE WiMAX-Packet-Flow-Descriptor-Capabilities 5 byte # Role of 6/7 swapped vs definition in WMF R015v01 -ATTRIBUTE WiMAX-ASN-Network-Service-Capabilities 6 integer -ATTRIBUTE WiMAX-Authorized-IP-Services 7 integer +ATTRIBUTE WiMAX-ASN-Network-Service-Capabilities 6 integer +ATTRIBUTE WiMAX-Authorized-IP-Services 7 integer # This is really a bitmap -VALUE WiMAX-Accounting-Capabilities No-Accounting 0 -VALUE WiMAX-Accounting-Capabilities IP-Session-Based 1 -VALUE WiMAX-Accounting-Capabilities Flow-Based 2 +VALUE WiMAX-Accounting-Capabilities No-Accounting 0 +VALUE WiMAX-Accounting-Capabilities IP-Session-Based 1 +VALUE WiMAX-Accounting-Capabilities Flow-Based 2 # This is really a bitmap -VALUE WiMAX-Hotlining-Capabilities Not-Supported 0 -VALUE WiMAX-Hotlining-Capabilities Hotline-Profile-Id 1 -VALUE WiMAX-Hotlining-Capabilities NAS-Filter-Rule 2 -VALUE WiMAX-Hotlining-Capabilities HTTP-Redirection 4 -VALUE WiMAX-Hotlining-Capabilities IP-Redirection 8 +VALUE WiMAX-Hotlining-Capabilities Not-Supported 0 +VALUE WiMAX-Hotlining-Capabilities Hotline-Profile-Id 1 +VALUE WiMAX-Hotlining-Capabilities NAS-Filter-Rule 2 +VALUE WiMAX-Hotlining-Capabilities HTTP-Redirection 4 +VALUE WiMAX-Hotlining-Capabilities IP-Redirection 8 -VALUE WiMAX-Idle-Mode-Notification-Cap Not-Supported 0 -VALUE WiMAX-Idle-Mode-Notification-Cap Supported 1 +VALUE WiMAX-Idle-Mode-Notification-Cap Not-Supported 0 +VALUE WiMAX-Idle-Mode-Notification-Cap Supported 1 # v2 also implies support for v1 VALUE WiMAX-Packet-Flow-Descriptor-Capabilities v1 1 -VALUE WiMAX-Packet-Flow-Descriptor-Capabilities v2 2 +VALUE WiMAX-Packet-Flow-Descriptor-Capabilities v2 2 # This is really a bitmap. # For Wichorus gateway this is used to @@ -53,20 +54,20 @@ VALUE WiMAX-Packet-Flow-Descriptor-Capabilities v2 2 # similar and used to indicate services the ASN is authorized to # support for the subscriber (see sub-tlv 7 for Wichorus' version) # Wichorus' implementation is also shifted left one bit... -VALUE WiMAX-ASN-Network-Service-Capabilities DHCPv4-Relay 2 -VALUE WiMAX-ASN-Network-Service-Capabilities DHCPv6-Relay 4 -VALUE WiMAX-ASN-Network-Service-Capabilities DHCPv4-Proxy 8 -VALUE WiMAX-ASN-Network-Service-Capabilities DHCPv6-Proxy 16 -VALUE WiMAX-ASN-Network-Service-Capabilities FA 32 -VALUE WiMAX-ASN-Network-Service-Capabilities PMIP-Client 64 +VALUE WiMAX-ASN-Network-Service-Capabilities DHCPv4-Relay 2 +VALUE WiMAX-ASN-Network-Service-Capabilities DHCPv6-Relay 4 +VALUE WiMAX-ASN-Network-Service-Capabilities DHCPv4-Proxy 8 +VALUE WiMAX-ASN-Network-Service-Capabilities DHCPv6-Proxy 16 +VALUE WiMAX-ASN-Network-Service-Capabilities FA 32 +VALUE WiMAX-ASN-Network-Service-Capabilities PMIP-Client 64 # ... plus additional, but these are the only relevant ones for now # This is really a bitmap # Proprietary definition of supported services. Used by the AAA to # indicate which services the ASN is allowed to support for the MS -VALUE WiMAX-Authorized-IP-Services CMIPv4 1 -VALUE WiMAX-Authorized-IP-Services PMIPv4 2 -VALUE WiMAX-Authorized-IP-Services SimpleIPv4 4 +VALUE WiMAX-Authorized-IP-Services CMIPv4 1 +VALUE WiMAX-Authorized-IP-Services PMIPv4 2 +VALUE WiMAX-Authorized-IP-Services SimpleIPv4 4 END-TLV WiMAX-Capability @@ -105,14 +106,14 @@ ATTRIBUTE WiMAX-HA-RK-SPI 16 integer ATTRIBUTE WiMAX-HA-RK-Lifetime 17 integer -# Calculation is the same as MN-HA-CMIP4, etc. +# Calculation is the same as MN-HA-CMIP4, etc. # With CMIP the MN may not know the appropriate HA IP address when calculating # the MIP RRQ AE (IPv4) or during a BU (IPv6). In this case it must either use an -# old known HA IP address or can indicate whether dynamic HA assignment from the -# hCSN is preferred to the vCSN, or if there is no preference by providing +# old known HA IP address or can indicate whether dynamic HA assignment from the +# hCSN is preferred to the vCSN, or if there is no preference by providing # ALL-ZERO-ONE-ADDR (255.255.255.255/0.0.0.0 respectively) in the MIP RRQ sent # to the FA. The RRQ-MN-HA key is calculated using this RRQ-HA-IP address and is -# required by the HA to validate the MIP RRQ received from the MS as it does +# required by the HA to validate the MIP RRQ received from the MS as it does # not contain the actual HA IP address. ATTRIBUTE WiMAX-RRQ-HA-IP 18 combo-ip ATTRIBUTE WiMAX-RRQ-MN-HA-Key 19 octets encrypt=2 @@ -121,24 +122,24 @@ ATTRIBUTE WiMAX-Time-Of-Day-Time 20 tlv BEGIN-TLV WiMAX-Time-Of-Day-Time ATTRIBUTE WiMAX-Hour 1 byte -ATTRIBUTE WiMAX-Minute 2 byte +ATTRIBUTE WiMAX-Minute 2 byte ATTRIBUTE WiMAX-UTC-Offset 3 integer END-TLV WiMAX-Time-Of-Day-Time ATTRIBUTE WiMAX-Session-Continue 21 integer -VALUE WiMAX-Session-Continue False 0 -VALUE WiMAX-Session-Continue True 1 +VALUE WiMAX-Session-Continue False 0 +VALUE WiMAX-Session-Continue True 1 ATTRIBUTE WiMAX-Beginning-Of-Session 22 integer -VALUE WiMAX-Beginning-Of-Session False 0 -VALUE WiMAX-Beginning-Of-Session True 1 +VALUE WiMAX-Beginning-Of-Session False 0 +VALUE WiMAX-Beginning-Of-Session True 1 -# This is pulled from WMF R015v01 - because our ASN-GW supports Simple IP and a -# simple way to denote this was needed without building in a lot of private +# This is pulled from WMF R015v01 - because our ASN-GW supports Simple IP and a +# simple way to denote this was needed without building in a lot of private # logic that would one day simply be replaced by this logic anyway. -# Note: Attribute renamed in Release 1.5 to Network-Technology. Maintain the +# Note: Attribute renamed in Release 1.5 to Network-Technology. Maintain the # old name here to allow for better backwards compatibility. ATTRIBUTE WiMAX-IP-Technology 23 integer @@ -150,7 +151,7 @@ VALUE WiMAX-IP-Technology CMIP6 4 VALUE WiMAX-IP-Technology Ethernet-CS 5 VALUE WiMAX-IP-Technology Simple-ETH 6 VALUE WiMAX-IP-Technology MIP-Based-ETH 7 -VALUE WiMAX-IP-Technology PMIP6 8 +VALUE WiMAX-IP-Technology PMIP6 8 ATTRIBUTE WiMAX-Hotline-Indicator 24 string ATTRIBUTE WiMAX-Prepaid-Indicator 25 byte @@ -169,14 +170,14 @@ VALUE WiMAX-Direction Uplink 1 VALUE WiMAX-Direction Downlink 2 VALUE WiMAX-Direction Bi-Directional 3 -ATTRIBUTE WiMAX-Activation-Trigger 5 byte +ATTRIBUTE WiMAX-Activation-Trigger 5 byte # This is really a bitmap -VALUE WiMAX-Activation-Trigger Reserved-0 0 -VALUE WiMAX-Activation-Trigger Provisioned 1 -VALUE WiMAX-Activation-Trigger Admit 2 +VALUE WiMAX-Activation-Trigger Reserved-0 0 +VALUE WiMAX-Activation-Trigger Provisioned 1 +VALUE WiMAX-Activation-Trigger Admit 2 VALUE WiMAX-Activation-Trigger Activate 4 -VALUE WiMAX-Activation-Trigger Dynamically-Changeable 8 +VALUE WiMAX-Activation-Trigger Dynamically-Changeable 8 ATTRIBUTE WiMAX-Transport-Type 6 byte @@ -234,9 +235,9 @@ VALUE WiMAX-Media-Flow-Type Data 13 END-TLV WiMAX-QoS-Descriptor -# Same as QoS-Descriptor... used only in interim and stop records for +# Same as QoS-Descriptor... used only in interim and stop records for # flow based accounting. -ATTRIBUTE WiMAX-Uplink-Granted-QoS 30 tlv # UPDATED - WAS STRING... +ATTRIBUTE WiMAX-Uplink-Granted-QoS 30 tlv # UPDATED - WAS STRING... ATTRIBUTE WiMAX-Control-Packets-In 31 integer ATTRIBUTE WiMAX-Control-Octets-In 32 integer ATTRIBUTE WiMAX-Control-Packets-Out 33 integer @@ -354,9 +355,9 @@ ATTRIBUTE WiMAX-NSP-Id 57 octets # WiMAX-HA-RK-Requested has been removed from WMF Release 1.3 and later. # However the attribute has not been replaced so this is left to preserve # backward compatibility. This attribute is deprecated and will be removed. -ATTRIBUTE WiMAX-HA-RK-Key-Requested 58 integer +ATTRIBUTE WiMAX-HA-RK-Key-Requested 58 integer -VALUE WiMAX-HA-RK-Key-Requested No 0 +VALUE WiMAX-HA-RK-Key-Requested No 0 VALUE WiMAX-HA-RK-Key-Requested Yes 1 ATTRIBUTE WiMAX-Count-Type 59 byte @@ -382,7 +383,7 @@ ATTRIBUTE WiMAX-Downlink-Granted-QoS 63 tlv # More MIP keys, calculated as above... but in different packets. # In a roaming scenario both the vAAA and the hAAA can provide a HA -# and related key context, as well as DHCP server information to the ASN-GW. +# and related key context, as well as DHCP server information to the ASN-GW. # These attributes are used by the vCSN. ATTRIBUTE WiMAX-vHA-IP-MIP4 64 ipaddr ATTRIBUTE WiMAX-vHA-IP-MIP6 65 ipv6addr @@ -401,8 +402,6 @@ ATTRIBUTE WiMAX-vDHCP-RK 75 octets encrypt=2 ATTRIBUTE WiMAX-vDHCP-RK-Key-ID 76 integer ATTRIBUTE WiMAX-vDHCP-RK-Lifetime 77 integer - - # About 10 more attributes in 1.3 - +END-VENDOR WiMAX -- cgit v1.2.1