From 91f44b2940cb36f3eaf0580726155bb58304ebb6 Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Tue, 16 Apr 2013 18:12:23 +0000 Subject: Update USR Robotics and 3GPP2 dictionarys. svn path=/trunk/; revision=48883 --- radius/dictionary.3gpp2 | 223 +++++++++++++++++++++++++++++++++++++++++++++--- radius/dictionary.usr | 23 ++++- 2 files changed, 232 insertions(+), 14 deletions(-) (limited to 'radius') diff --git a/radius/dictionary.3gpp2 b/radius/dictionary.3gpp2 index 7cb38fb90a..884105a323 100644 --- a/radius/dictionary.3gpp2 +++ b/radius/dictionary.3gpp2 @@ -86,13 +86,29 @@ ATTRIBUTE 3GPP2-MN-HA-Shared-Key 58 string encrypt=2 # The next set of attributes contain sub-types ATTRIBUTE 3GPP2-Remote-IP-Address 59 octets -# 60 - 69 are marked "reserved" +ATTRIBUTE 3GPP2-HRPD-Access/Terminal-Authentication-and-1x-Access-Authorization 60 integer +ATTRIBUTE 3GPP2-AT-Hardware-Identifier 61 integer +BEGIN-TLV + ATTRIBUTE AT-hardware-identifier-type 1 string + ATTRIBUTE AT-hardware-identifier-value 2 string +END-TLV -ATTRIBUTE 3GPP2-Remote-IPv6-Address 70 octets -ATTRIBUTE 3GPP2-Remote-Address-Table-Index 71 octets -ATTRIBUTE 3GPP2-Remote-IPv4-Addr-Octet-Count 72 octets -ATTRIBUTE 3GPP2-Allowed-Diffserv-Marking 73 octets -ATTRIBUTE 3GPP2-Service-Option-Profile 74 octets +# 62 - 69 are marked "reserved" + +ATTRIBUTE 3GPP2-Remote-IPv6-Address 70 octets +ATTRIBUTE 3GPP2-Remote-Address-Table-Index 71 octets +ATTRIBUTE 3GPP2-Remote-IPv4-Addr-Octet-Count 72 octets +ATTRIBUTE 3GPP2-Allowed-Diffserv-Marking 73 tlv +BEGIN-TLV 3GPP2-Allowed-Diffserv-Marking + ATTRIBUTE flags-for-Allowed-Diffserv-class 1 string + ATTRIBUTE Max-class-selection-marking 2 string + ATTRIBUTE Reverse-tunnel-marking 3 string +END-TLV 3GPP2-Allowed-Diffserv-Marking +#contains subtypes +ATTRIBUTE 3GPP2-Service-Option-Profile 74 tlv +BEGIN-TLV 3GPP2-Service-Option-Profile + ATTRIBUTE service-option 1 integer +END-TLV 3GPP2-Service-Option-Profile # the following don't contain subtypes ATTRIBUTE 3GPP2-DNS-Update-Required 75 integer @@ -112,8 +128,24 @@ ATTRIBUTE 3GPP2-Session-Termination-Capability 88 integer ATTRIBUTE 3GPP2-Allowed-Persistent-TFTs 89 integer # The next set of attributes contain sub-types -ATTRIBUTE 3GPP2-Prepaid-Acct-Quota 90 octets -ATTRIBUTE 3GPP2-Prepaid-acct-Capability 91 octets +ATTRIBUTE 3GPP2-Prepaid-Acct-Quota 90 tlv +BEGIN-TLV 3GPP2-Prepaid-Acct-Quota + ATTRIBUTE QID 1 string + ATTRIBUTE VolumeQuota 2 string + ATTRIBUTE VolumeQuotaOverflow 3 string + ATTRIBUTE VolumeThreshold 4 string + ATTRIBUTE VolumeThreshouldOverflow 5 string + ATTRIBUTE DurationQuota 6 string + ATTRIBUTE DurationThreshold 7 string + ATTRIBUTE Update-Reason 8 string +END-TLV 3GPP2-Prepaid-Acct-Quota + +#contains sub-types +ATTRIBUTE 3GPP2-Prepaid-acct-Capability 91 tlv +BEGIN-TLV 3GPP2-Prepaid-acct-Capability + ATTRIBUTE AvailableInClient 1 integer + ATTRIBUTE SelectedForSession 2 integer +END-TLV 3GPP2-Prepaid-acct-Capability ATTRIBUTE 3GPP2-MIP-Lifetime 92 octets ATTRIBUTE 3GPP2-Acct-Stop-Trigger 93 integer @@ -126,12 +158,106 @@ ATTRIBUTE 3GPP2-Disconnect-Reason 96 integer # The next set of attributes contain sub-types ATTRIBUTE 3GPP2-Remote-IPv6-Octet-Count 97 octets -ATTRIBUTE 3GPP2-PrePaid-Tariff-Switching 98 octets -ATTRIBUTE 3GPP2-Subnet 108 octets +#contains sub-types +ATTRIBUTE 3GPP2-PrePaid-Tariff-Switching 98 tlv +BEGIN-TLV 3GPP2-PrePaid-Tariff-Switching + ATTRIBUTE QuotaIDentifier 1 integer + ATTRIBUTE VolumeUsedAfterTariffSwitch 2 integer + ATTRIBUTE VolumeUsedATSOverflow 3 integer + ATTRIBUTE TariffSwitchInterval 4 integer + ATTRIBUTE TimeIntervalafterTariffSwitchUpdate 5 integer +END-TLV 3GPP2-PrePaid-Tariff-Switching +#contain sub-types +ATTRIBUTE 3GPP2-Authorization-Parameters 99 tlv +BEGIN-TLV 3GPP2-Authorization-Parameters + ATTRIBUTE BAK-Identifier 1 integer + ATTRIBUTE Timestamp-long 2 integer + ATTRIBUTE Authorization-Signature 3 string +END-TLV 3GPP2-Authorization-Parameters + + +ATTRIBUTE 3GPP2-BCMCS_FLOW_ID 100 bytes + +#contain sub-types +ATTRIBUTE 3GPP2-BCMCS-Capability 101 tlv +BEGIN-TLV 3GPP2-BCMCS-Capability + ATTRIBUTE Protocol-Revision 1 integer +END-TLV 3GPP2-BCMCS-Capability + +#contain sub-types +ATTRIBUTE 3GPP2-Common-Session-Info 102 tlv +BEGIN-TLV 3GPP2-Common-Session-Info + ATTRIBUTE BCMCS_FLOW_ID 1 bytes + ATTRIBUTE Program-Start-Time 2 date + ATTRIBUTE Program-End-Time 3 date + ATTRIBUTE Program-Allowed-Registration-Time(seconds) 4 integer + ATTRIBUTE Authorization-Required-Flag 5 string + ATTRIBUTE QoS-Parameter 6 integer #?? + ATTRIBUTE BCMCS_Flow_Priority 7 integer +END-TLV 3GPP2-Common-Session-Info + +#contain sub-types +ATTRIBUTE BSN-Session-Info 103 tlv +BEGIN-TLV BSN-Session-Info + ATTRIBUTE BCMCS_FLOW_ID 1 bytes + ATTRIBUTE Multicast-IP-Address 2 ipaddr + ATTRIBUTE Destination-Port-Number 3 integer + ATTRIBUTE Header-Compression-Algorithm 4 string + ATTRIBUTE CID 5 string + ATTRIBUTE MAX-CID 6 integer + ATTRIBUTE Compression-Profile 7 integer + ATTRIBUTE MAX-Header-Size 8 integer + ATTRIBUTE MRRU 9 integer + ATTRIBUTE Content-Server-Source-IP-Address 10 ipaddr + ATTRIBUTE Content-Server-Source-IPv6-Address 11 ipv6addr +END-TLV BSN-Session-Info + +#contain sub-types +ATTRIBUTE RAN-Session-Info 104 tlv +BEGIN-TLV RAN-Session-Info + ATTRIBUTE BCMCS_FLOW_ID 1 integer + ATTRIBUTE Encryption-Mechanism 2 integer + ATTRIBUTE BAK-Identifier 3 integer + ATTRIBUTE BAK 4 string + ATTRIBUTE BAK-Expire-Time 5 string + ATTRIBUTE Session-Bandwidth 6 integer +END-TLV RAN-Session-Info + +ATTRIBUTE Reason-Code 105 integer +ATTRIBUTE 3GPP2-BCMCS-Flow-Transmission-Time 107 date + +#contain sub-types +ATTRIBUTE 3GPP2-Subnet 108 tlv +BEGIN-TLV 3GPP2-Subnet + ATTRIBUTE Subnet 1 bytes + ATTRIBUTE Sector-ID 2 bytes +END-TLV 3GPP2-Subnet +ATTRIBUTE 3GPP2-Multicast-IP-Address 109 ipaddr +ATTRIBUTE 3GPP2-Port 110 integer + +#contain sub-typess +ATTRIBUTE 3GPP2-TK-Info 112 tlv +BEGIN-TLV 3GPP2-TK-Info + ATTRIBUTE TK 1 integer + ATTRIBUTE TK_RAND 2 integer +END-TLV 3GPP2-TK-Info +#contain sub-types +ATTRIBUTE 3GPP2-BAK-ID 113 tlv +BEGIN-TLV 3GPP2-BAK-ID + ATTRIBUTE BAK_ID 1 integer + ATTRIBUTE BAK_Expire 2 integer +END-TLV 3GPP2-BAK-ID ATTRIBUTE 3GPP2-Reverse-PDCH-RC 114 integer ATTRIBUTE 3GPP2-MEID 116 string -ATTRIBUTE 3GPP2-DNS-Server-IP-Address 117 octets +#contain sub-types +ATTRIBUTE 3GPP2-DNS-Server-IP-Address 117 tlv +BEGIN-TLV 3GPP2-DNS-Server-IP-Address + ATTRIBUTE Primary-DNS-Server 1 ipaddr + ATTRIBUTE Secondary-DNS-Server 2 ipaddr + ATTRIBUTE Flag 3 string + ATTRIBUTE Entity-Type 4 string +END-TLV 3GPP2-DNS-Server-IP-Address ATTRIBUTE 3GPP2-MIP6-Home-Agent-Address-From-BU 118 ipv6addr ATTRIBUTE 3GPP2-MIP6-Care-of-Address 119 ipv6addr @@ -148,8 +274,28 @@ ATTRIBUTE 3GPP2-MIP6-Home-Link-Prefix-Attr-A 128 octets ATTRIBUTE 3GPP2-Max-Authorized-Aggr-Bandwidth 130 integer # The next set of attributes contain sub-types -ATTRIBUTE 3GPP2-Authorized-Flow-Profile-IDs 131 octets -ATTRIBUTE 3GPP2-Granted-QoS-Parameters 132 octets +ATTRIBUTE 3GPP2-Authorized-Flow-Profile-IDs 131 tlv +BEGIN-TLV 3GPP2-Authorized-Flow-Profile-IDs + ATTRIBUTE ProfileID_Forward 1 string + ATTRIBUTE ProfileID_Reverse 2 string + ATTRIBUTE ProfileID_Bi-direction 3 string +END-TLV 3GPP2-Authorized-Flow-Profile-IDs + +ATTRIBUTE 3GPP2-Granted-QoS-Parameters 132 tlv +BEGIN-TLV 3GPP2-Granted-QoS-Parameters + ATTRIBUTE Direction 1 integer + ATTRIBUTE FLOW_ID 2 integer + ATTRIBUTE QoS_ATTRIBUTE_SET_ID 3 integer + ATTRIBUTE FlowProfileID 4 integer + ATTRIBUTE Traffic_Class 5 string + ATTRIBUTE Peak_Rate 6 string + ATTRIBUTE Bucket_Size 7 string + ATTRIBUTE Token_Rate 8 string + ATTRIBUTE Max_Latency 9 string + ATTRIBUTE Max_IP_Packet_Loss_Rate 10 string + ATTRIBUTE Packet_Size 11 string + ATTRIBUTE Delay_Var_Sensitive 12 string +END-TLV 3GPP2-Granted-QoS-Parameters ATTRIBUTE 3GPP2-Maximum-Per-Flow-Priority 133 integer ATTRIBUTE 3GPP2-MIP6-Authenticator 134 octets @@ -180,6 +326,8 @@ ATTRIBUTE 3GPP2-MIPv4-Mesg-Id 173 string ATTRIBUTE 3GPP2-MIP6-HA-Local-Assignment-Capblty 179 integer +ATTRIBUTE 3GPP2-PMIP-Based-Mobility-Capability 193 integer + ATTRIBUTE 3GPP2-Accounting-Mode 198 integer ## ?? ATTRIBUTE 3GPP2-HAAA-MIP6-HA-Protocol-Capblty-Ind 203 integer @@ -188,9 +336,58 @@ ATTRIBUTE 3GPP2-VAAA-Assigned-MIP6-HA 205 ipv6addr ATTRIBUTE 3GPP2-VAAA-Assigned-MIP6-HL 206 octets ATTRIBUTE 3GPP2-VAAA-MIP6-HA-Protocol-Capblty-Ind 207 integer +ATTRIBUTE 3GPP2-DNS-Server-IPV6-Address 214 tlv +BEGIN-TLV 3GPP2-DNS-Server-IPV6-Address + ATTRIBUTE Primary-DNS-Server-IPV6-ADDRESS 1 ipv6addr + ATTRIBUTE Secondary-DNS-Server-IPV6-ADDRESS 2 ipv6addr + ATTRIBUTE Flag 3 string + ATTRIBUTE Entity-Type 4 string +END-TLV 3GPP2-DNS-Server-IPV6-Address + VALUE 3GPP2-Airlink-Record-Type Connection-Setup 1 VALUE 3GPP2-Airlink-Record-Type Active-Start 2 VALUE 3GPP2-Airlink-Record-Type Active-Stop 3 VALUE 3GPP2-Airlink-Record-Type Short-Data-Burst 4 +VALUE Authorization-Required-Flag Authorization-is-not-required-for-this-flow 0 +VALUE Authorization-Required-Flag Authorization-is-required-for-this-flow 1 + +VALUE Reason-Code Reserved 0 +VALUE Reason-Code Authorization-Only 1 +VALUE Reason-Code Session-Discovery-Only 2 +VALUE Reason-Code Authorization-and-Session-Discovery 3 + + +VALUE Header-Compression-Algorithm No-Header-Compression 0 +VALUE Header-Compression-Algorithm ROHC-U-mode 1 + +VALUE CID Small-CID 0 +VALUE CID Large-CID 1 + +VALUE Encryption-Mechanism High-layer-encryption-in-the-Content-Server 0 +VALUE Encryption-Mechanism Link-layer-encryption-in-the-RAN 1 + +VALUE 3GPP2-PMIP-Based-Mobility-Capability AGW-supports-the-Network-PMIP4-only 1 +VALUE 3GPP2-PMIP-Based-Mobility-Capability AGW-supports-the-Network-PMIP6-only 2 +VALUE 3GPP2-PMIP-Based-Mobility-Capability AGW-supports-the-both-Network-PMIP4-and-PMIP6 3 + +VALUE Update-Reason Pre-initializatio 1 +VALUE Update-Reason Initial-request 2 +VALUE Update-Reason Threshold-reached 3 +VALUE Update-Reason Quota-reached 4 +VALUE Update-Reason Remote-Forced-disconnect 5 +VALUE Update-Reason Client-Service-termination 6 +VALUE Update-Reason Main-SI-released 7 +VALUE Update-Reason Service-Instance-not-established 8 +VALUE Update-Reason Tariff-Switch-Update 9 + +VALUE AvailableInClient PrePaid-Accounting-for-Volume-supported 1 +VALUE AvailableInClient PrePaid-Accounting-for-Duration-supported 2 +VALUE AvailableInClient PrePaid-Accounting-for-Volume-and-Duration-supported 3 + +VALUE SelectedForSession PrePaid Accounting not used 0 +VALUE SelectedForSession Usage-of-PrePaid-Accounting-for-Volume 1 +VALUE SelectedForSession Usage-of-PrePaid-Accounting-for-Duration 2 +VALUE SelectedForSession Usage-of-PrePaid-Accounting-for-Volume-and-Duration 3 + END-VENDOR 3GPP2 diff --git a/radius/dictionary.usr b/radius/dictionary.usr index 966ae4ca5a..c4cd654e9b 100644 --- a/radius/dictionary.usr +++ b/radius/dictionary.usr @@ -20,6 +20,10 @@ ATTRIBUTE Char-Noecho 250 integer # USR specific Integer Translations # +#Taken from the website: +#https://bitbucket.org/02strich/openvpn-auth-radius/src/b52f7f5e1acd/RadiusClass/utilities/dictionary +# + VALUE Termination-Action Manage-Resources 2 VALUE Acct-Status-Type Modem-Start 4 @@ -263,7 +267,7 @@ ATTRIBUTE USR-Chassis-Call-Channel 0x901B integer ATTRIBUTE USR-Keypress-Timeout 0x901C integer ATTRIBUTE USR-Unauthenticated-Time 0x901D integer ATTRIBUTE USR-Connect-Speed 0x9023 integer -ATTRIBUTE USR-Framed_IP_Address_Pool_Name 0x9024 string +ATTRIBUTE USR-Framed_IP_Address_Pool_Name 0x9024 string #it is RAD-IP-Address-Pool in our code ATTRIBUTE USR-MP-EDO 0x9025 string # @@ -310,6 +314,8 @@ ATTRIBUTE USR-Routing-Protocol 0x9826 integer ATTRIBUTE USR-Modem-Group 0x9827 integer ATTRIBUTE USR-Modem-Training-Time 0x9842 integer ATTRIBUTE USR-Interface-Index 0x9843 integer +ATTRIBUTE USR-Multicast-Proxy 0x984d integer +ATTRIBUTE USR-Multicast-Forwarding 0x9850 integer ATTRIBUTE USR-MP-MRRU 0x982f integer ATTRIBUTE USR-SAP-Filter-In 0x9002 string @@ -379,7 +385,15 @@ ATTRIBUTE USR-IGMP-Query-Interval 0x9851 integer ATTRIBUTE USR-IGMP-Maximum-Response-Time 0x9852 integer ATTRIBUTE USR-IGMP-Robustness 0x9853 integer ATTRIBUTE USR-IGMP-Version 0x9854 integer +ATTRIBUTE USR-Call-Arrival-Time 0x9858 integer +ATTRIBUTE USR-Call-End-Time 0x9859 integer ATTRIBUTE USR-Callback-Type 0x986a integer +ATTRIBUTE USR-Pre-shared-MN-Key 0x9873 integer +ATTRIBUTE USR-MIP-NAI 0x9874 string +ATTRIBUTE USR-Agent 0x9876 integer +ATTRIBUTE USR-Mobile-Session-ID 0x9885 integer +ATTRIBUTE USR-Mobile-Accounting-Type 0x9886 integer + ATTRIBUTE USR-Request-Type 0xf001 integer ATTRIBUTE USR-RMMIE-Num-Of-Updates 0x01ce integer ATTRIBUTE USR-RMMIE-Manufacturer-ID 0x01df integer @@ -459,6 +473,7 @@ ATTRIBUTE USR-Mobile-Accounting-Type 0x9886 integer ATTRIBUTE USR-Mobile-Service-Option 0x9887 integer ATTRIBUTE USR-Wallclock-Timestamp 0x9888 integer ATTRIBUTE USR-Dvmrp-Initial-Flooding 0x988a integer +ATTRIBUTE USR-HARC-Disconnect-Code 0x988b integer ATTRIBUTE USR-Telnet-Options 0x988c integer ATTRIBUTE USR-CDMA-PktData-Network-ID 0x988d integer ATTRIBUTE USR-Auth-Next-Server-Address 0x988e ipaddr @@ -488,6 +503,9 @@ ATTRIBUTE USR-VLAN-Tag 0x98a5 integer ATTRIBUTE USR-Rad-IP-Pool-Definition 0x98a6 string ATTRIBUTE USR-Rad-NMC-Call-Progress-Status 0x98a7 integer ATTRIBUTE USR-Rad-NMC-Blocks_RX 0x98a8 integer +ATTRIBUTE USR-Total-Bytes-Remain 0x98b8 integer +ATTRIBUTE USR-Forward-Rate-Limit 0x98b9 integer +ATTRIBUTE USR-Reverse-Rate-Limit 0x98bc integer ATTRIBUTE USR-NAS-Type 0xf002 integer ATTRIBUTE USR-Auth-Mode 0xf003 integer @@ -1651,4 +1669,7 @@ VALUE CW-Trans-Cld-Party-E164-Type Subscriber-Number 5 VALUE CW-Trans-Cld-Party-E164-Type Abbreviated-Number 6 VALUE CW-Trans-Cld-Party-E164-Type Reserved 7 +VALUE USR-Pre-Paid-Enabled Phase2-active-Time-counted 1 +VALUE USR-Pre-Paid-Enabled Phase2-Transfer/Reciev-Packet-counted 2 +VALUE USR-Pre-Paid-Enabled Phase2-Total-Packet-counted 3 END-VENDOR USR -- cgit v1.2.1